Merge remote-tracking branch 'dni/master'

dotnetinstaller · May 23, 2024 · c21d0ac · c21d0ac
2 parents 5beb428 + b73dccb
commit c21d0ac
Show file tree

Hide file tree

Showing 496 changed files with 1,596 additions and 50,610 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,10 +46,80 @@ jobs:
       # The windows-2016 virtual environment has an older version, Microsoft Visual C++ 2010 Runtime 10.0.30319.
       run: choco install vcredist2010 --version=10.0.40219.32503
 
+    - name: Install .NET 6 SDK
+      run: |
+        Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
+        .\dotnet-install.ps1 -Version 6.0.413 -Architecture "x64" -InstallDir "C:\Program Files\dotnet" -NoPath -Verbose
+
+    - name: dotnet version and info
+      shell: cmd
+      run: |
+        "C:\Program Files\dotnet\dotnet.exe" --version
+        "C:\Program Files\dotnet\dotnet.exe" --info
+
+    - name: Configure Windows Error Reporting
+      shell: cmd
+      run: |
+        reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_EXPAND_SZ /v DumpFolder /d "${{ github.workspace }}\CrashDumps" /f
+        reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpCount /d 10 /f
+        reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 2 /f
+        reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_EXPAND_SZ /v DumpFolder /d "${{ github.workspace }}\CrashDumps" /f
+        reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpCount /d 10 /f
+        reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 2 /f
+
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: msbuild /t:all /m /p:Configuration=${{ matrix.Configuration }} .\dni.proj
-
+
+    - name: Dump environment variables
+      if: always()
+      shell: cmd
+      run: set
+
+    - name: Publish Failed Test Results Report
+      if: github.event_name != 'pull_request'
+      uses: dorny/test-reporter@v1
+      with:
+        name: Tests
+        path: TestResults/*.trx
+        reporter: dotnet-trx
+        list-suites: 'failed'
+        list-tests: 'failed'
+        max-annotations: 50
+
+    - name: Export Windows Event Logs
+      if: failure()
+      shell: cmd
+      run: |
+        wevtutil epl Application Application.evtx
+        wevtutil epl Security Security.evtx
+        wevtutil epl System System.evtx
+
+    - name: Upload Test Result Files
+      if: always()
+      uses: actions/[email protected]
+      with:
+        name: TestResults-${{ matrix.Configuration }}
+        path: |
+            .\**\TestResults\**\*
+            .\InstallerEditor\**\*.png
+            .\*.evtx
+            .\CrashDumps\**\*
+
+      # Upload the temp files separately.
+      # Otherwise the following error occurs:
+      # The rootDirectory: "D:\a\dotnetinstaller\dotnetinstaller" is not a parent directory of the file: "C:\Users\runneradmin\AppData\Local\Temp\33fcd148-d0c7-46cd-8333-9b21a22d2d2c.xml"
+    - name: Upload Temp File
+      if: failure()
+      uses: actions/[email protected]
+      with:
+        name: TempLogs-${{ matrix.Configuration }}
+        path: |
+            C:\Users\runneradmin\AppData\Local\Temp\*.exe
+            C:\Users\runneradmin\AppData\Local\Temp\*.log
+            C:\Users\runneradmin\AppData\Local\Temp\*.txt
+            C:\Users\runneradmin\AppData\Local\Temp\*.xml
+
     - name: Upload Build Artifacts
       uses: actions/[email protected]
       with:

diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,6 @@ StyleCop.Cache
 .vs
 packages
 /temp
+/UpgradeLog.htm
+launchSettings.json
+/TestResults
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ Features
 * [#114](https://github.com/dotnetinstaller/dotnetinstaller/issues/114) - Added support for operating system product type filters - [@icnocop](https://github.com/icnocop).
 * [#153](https://github.com/dotnetinstaller/dotnetinstaller/issues/153) - Added support for sub-directory installed check comparison using semantic versioning - [@icnocop](https://github.com/icnocop).
 * [#156](https://github.com/dotnetinstaller/dotnetinstaller/pull/156) - Building and distributing 64-bit version of CabLib.dll for reference by 64-bit processes - [@icnocop](https://github.com/icnocop).
+* [#157](https://github.com/dotnetinstaller/dotnetinstaller/issues/157) - Added Installed Check Type which queries WMI - [@icnocop](https://github.com/icnocop).
 
 3.2.115 (1/15/2022)
 ===================

diff --git a/Documentation/Content/InstalledChecks.aml b/Documentation/Content/InstalledChecks.aml
@@ -18,8 +18,8 @@
       <title>Installed Check Types</title>
       <content>
         <para>
-          There are four types of installed checks: <newTerm>check_file</newTerm>, <newTerm>check_directory</newTerm>,
-          <newTerm>check_registry_value</newTerm> and <newTerm>check_product</newTerm>. These can also be added under
+          There are different types of installed checks: <newTerm>check_file</newTerm>, <newTerm>check_directory</newTerm>,
+          <newTerm>check_registry_value</newTerm>, <newTerm>check_product</newTerm>, and <newTerm>check_wmi</newTerm>. These can also be added under
           installed check operators.
         </para>
       </content>
@@ -267,6 +267,26 @@
             </para>
           </content>
         </section>
+        <section address="checktypeswmi">
+          <title>check_wmi</title>
+          <content>
+            <para>
+              Query the WMI repository with the specified statement.
+              The following properties are available in the check.
+              <definitionTable>
+                <definedTerm>description</definedTerm>
+                <definition>A free-formed description of the check, appears in the logs.</definition>
+                <definedTerm>query</definedTerm>
+                <definition>
+                  The WMI Query Language (WQL) statement to execute.
+                </definition>
+              </definitionTable>
+            </para>
+            <para>
+              The component is determined to be installed if any records are returned as a result of executing the statement.
+            </para>
+          </content>
+        </section>
       </sections>
     </section>
     <section address="checkoperators">
@@ -298,4 +318,4 @@
       </content>
     </section>
   </developerConceptualDocument>
-</topic>
+</topic>
diff --git a/Documentation/Dni.shfbproj b/Documentation/Dni.shfbproj
@@ -35,8 +35,8 @@
     <PresentationStyle>Prototype</PresentationStyle>
     <HelpFileVersion>1.0.0.0</HelpFileVersion>
     <DocumentationSources>
-      <DocumentationSource sourceFile="..\InstallerLib\bin\$(Configuration)\InstallerLib.dll" xmlns="" />
-      <DocumentationSource sourceFile="..\InstallerLib\bin\$(Configuration)\InstallerLib.xml" xmlns="" />
+      <DocumentationSource sourceFile="..\InstallerLib\bin\$(Configuration)\net40\InstallerLib.dll" xmlns="" />
+      <DocumentationSource sourceFile="..\InstallerLib\bin\$(Configuration)\net40\InstallerLib.xml" xmlns="" />
     </DocumentationSources>
     <KeepLogFile>False</KeepLogFile>
     <CopyrightText>$(Copyright)</CopyrightText>

diff --git a/InstallerConfig/InstallerConfig.csproj b/InstallerConfig/InstallerConfig.csproj
@@ -1,87 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6E0789A6-234C-4B1C-AEB7-8C51BD754458}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>InstallerConfig</RootNamespace>
-    <AssemblyName>InstallerConfig</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>1591</NoWarn>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>1591</NoWarn>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup>
+    <TargetFramework>net40</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ApplicationManifest>InstallerConfig.exe.manifest</ApplicationManifest>
+    <NoWarn>1591</NoWarn>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Version\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\InstallerLib\InstallerLib.csproj">
-      <Project>{E19C2177-78F8-4C52-81FE-F49E157D647F}</Project>
-      <Name>InstallerLib</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="InstallerConfig.exe.manifest" />
+    <ProjectReference Include="..\InstallerLib\InstallerLib.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
 </Project>
diff --git a/InstallerConfig/Program.cs b/InstallerConfig/Program.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Runtime.InteropServices;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
 using InstallerLib;
 using CommandLine;
 using System.Reflection;

diff --git a/InstallerConfig/Properties/AssemblyInfo.cs b/InstallerConfig/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("InstallerConfig")]

diff --git a/InstallerDocLib/ConceptualTopic.cs b/InstallerDocLib/ConceptualTopic.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.ComponentModel;
 using System.Xml;

diff --git a/InstallerDocLib/DocAttribute.cs b/InstallerDocLib/DocAttribute.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Reflection;
 using System.ComponentModel;
 using InstallerLib;

diff --git a/InstallerDocLib/DocAttributeCollection.cs b/InstallerDocLib/DocAttributeCollection.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Xml;
 
 namespace InstallerDocLib

diff --git a/InstallerDocLib/DocLibGenerator.cs b/InstallerDocLib/DocLibGenerator.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Reflection;
 using InstallerLib;
-using System.ComponentModel;
 using System.Xml;
 using System.IO;
 

diff --git a/InstallerDocLib/InstallerDocLib.cs b/InstallerDocLib/InstallerDocLib.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using CommandLine;
 using System.Reflection;
 using System.IO;

diff --git a/InstallerDocLib/InstallerDocLib.csproj b/InstallerDocLib/InstallerDocLib.csproj
@@ -1,90 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{ADBA9E1B-677C-4399-823A-B8DFF471ECC3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>InstallerDocLib</RootNamespace>
-    <AssemblyName>InstallerDocLib</AssemblyName>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup>
+    <TargetFramework>net40</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <ApplicationManifest>InstallerDocLib.exe.manifest</ApplicationManifest>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Version\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="ConceptualTopic.cs" />
-    <Compile Include="DocAttribute.cs" />
-    <Compile Include="DocAttributeCollection.cs" />
-    <Compile Include="DocLibGenerator.cs" />
-    <Compile Include="InstallerDocLib.cs" />
-    <Compile Include="InstallerDocLibArguments.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\InstallerLib\InstallerLib.csproj">
-      <Project>{E19C2177-78F8-4C52-81FE-F49E157D647F}</Project>
-      <Name>InstallerLib</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="InstallerDocLib.exe.manifest" />
+    <ProjectReference Include="..\InstallerLib\InstallerLib.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
 </Project>