Merge pull request #83 from Smurf-IV/master-82-ScrubCommand

Master 82 scrub command
Smurf-IV · Dec 29, 2021 · 6ab36ba · 6ab36ba
2 parents f53e5c4 + da43179
commit 6ab36ba
Show file tree

Hide file tree

Showing 57 changed files with 1,154 additions and 2,978 deletions.
diff --git a/Elucidate/.editorconfig b/Elucidate/.editorconfig
@@ -0,0 +1,4 @@
+[*.cs]
+
+# IDE1006: Naming Styles
+dotnet_diagnostic.IDE1006.severity = none
diff --git a/Elucidate/Elucidate Windows Installer/CheckFor.Net.wxs b/Elucidate/Elucidate Windows Installer/CheckFor.Net.wxs
@@ -4,100 +4,99 @@ All rights reserved.
 Licensed under the Microsoft Reciprocal License. 
 See LICENSE.TXT file in the project root for full license information. -->
 
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" 
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
     <!--
-        .NET Framework installation state properties
+      .NET Framework installation state properties
+      Official documentation can be found at the following location:
+      .NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1/4.6.2/4.7/4.7.1/4.7.2/4.8 - https://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
+      https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/how-to-determine-which-versions-are-installed
+   -->
 
-        Official documentation can be found at the following location:
-
-           .NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1/4.6.2/4.7/4.7.1/4.7.2 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
-    -->
-
-    <?define NetFx472MinRelease = 461808 ?>
-    <?define NetFx472WebLink = http://go.microsoft.com/fwlink/?LinkId=863262 ?>
-    <?define NetFx472RedistLink = http://go.microsoft.com/fwlink/?LinkId=863265 ?>
-    <?define NetFx472EulaLink = http://referencesource.microsoft.com/license.html ?>
+    <?define NetFx480MinRelease = 528040 ?>
+    <?define NetFx48WebLink = http://go.microsoft.com/fwlink/?LinkId=2085155 ?>
+    <?define NetFx48RedistLink = https://go.microsoft.com/fwlink/?linkid=2088631 ?>
+    <?define NetFx48EulaLink = https://referencesource.microsoft.com/license.html ?>
 
     <Fragment>
         <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
-        <Property Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Secure="yes" />
-        <SetProperty Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-            WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx472MinRelease)"
+        <Property Id="WIX_IS_NETFRAMEWORK_480_OR_LATER_INSTALLED" Secure="yes" />
+        <SetProperty Id="WIX_IS_NETFRAMEWORK_480_OR_LATER_INSTALLED" Value="1" After="AppSearch">
+            WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx480MinRelease)"
         </SetProperty>
     </Fragment>
 
     <Fragment>
         <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
 
-        <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx472Web" />
-        <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx472EulaLink)" Overridable="yes" />
-        <WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
-        <WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" />
-        <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx48Web" />
+        <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx48EulaLink)" Overridable="yes" />
+        <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx480MinRelease)" Overridable="yes" />
+        <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
 
-        <PackageGroup Id="NetFx472Web">
+        <PackageGroup Id="NetFx48Web">
             <ExePackage
-                InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
-                RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
-                UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
+                InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
+                RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
+                UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
                 PerMachine="yes"
-                DetectCondition="!(wix.NetFx472WebDetectCondition)"
-                InstallCondition="!(wix.NetFx472WebInstallCondition)"
-                Id="NetFx472Web"
+                DetectCondition="!(wix.NetFx48WebDetectCondition)"
+                InstallCondition="!(wix.NetFx48WebInstallCondition)"
+                Id="NetFx48Web"
                 Vital="yes"
                 Permanent="yes"
                 Protocol="netfx4"
-                DownloadUrl="$(var.NetFx472WebLink)"
-                LogPathVariable="NetFx472FullLog"
+                DownloadUrl="$(var.NetFx48WebLink)"
+                LogPathVariable="NetFx48FullLog"
                 Compressed="no"
-                Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe">
+                Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe">
                 <RemotePayload
-                  CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
-                  CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
-                  Description="Microsoft .NET Framework 4.7.2 Setup"
-                  Hash="507ECDADC23A27C2283BA130A2AA51650E6BC05B"
-                  ProductName="Microsoft .NET Framework 4.7.2"
-                  Size="1447320"
-                  Version="4.7.3062.0" />
+                  CertificatePublicKey="793980B0038EBF0A88DAA08420FD3E66F53CC0CE"
+                  CertificateThumbprint="9DC17888B5CFAD98B3CB35C1994E96227F061675"
+                  Description="Microsoft .NET Framework 4.8 Setup"
+                  Hash="755349ECD6A478FE010E466B29911D2388F6CE94"
+                  ProductName="Microsoft .NET Framework 4.8"
+                  Size="1486376"
+                  Version="4.8.3761.0" />
             </ExePackage>
         </PackageGroup>
     </Fragment>
 
     <Fragment>
         <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
 
-        <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx472Redist" />
-        <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx472EulaLink)" Overridable="yes" />
-        <WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
-        <WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" />
-        <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx48Redist" />
+        <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx48EulaLink)" Overridable="yes" />
+        <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx480MinRelease)" Overridable="yes" />
+        <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
-        <PackageGroup Id="NetFx472Redist">
+        <PackageGroup Id="NetFx48Redist">
             <ExePackage
-                InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
-                RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
-                UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472FullLog].html&quot;"
+                InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
+                RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
+                UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
                 PerMachine="yes"
-                DetectCondition="!(wix.NetFx472RedistDetectCondition)"
-                InstallCondition="!(wix.NetFx472RedistInstallCondition)"
-                Id="NetFx472Redist"
+                DetectCondition="!(wix.NetFx48RedistDetectCondition)"
+                InstallCondition="!(wix.NetFx48RedistInstallCondition)"
+                Id="NetFx48Redist"
                 Vital="yes"
                 Permanent="yes"
                 Protocol="netfx4"
-                DownloadUrl="$(var.NetFx472RedistLink)"
-                LogPathVariable="NetFx472FullLog"
+                DownloadUrl="$(var.NetFx48RedistLink)"
+                LogPathVariable="NetFx48FullLog"
                 Compressed="no"
-                Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe">
+                Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe">
                 <RemotePayload
-                  CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
-                  CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
-                  Description="Microsoft .NET Framework 4.7.2 Setup"
-                  Hash="D3A416DC5FC75758D41B4C0158ACA69270D2A904"
-                  ProductName="Microsoft .NET Framework 4.7.2"
-                  Size="71607232"
-                  Version="4.7.3062.0" />
+                  CertificatePublicKey="793980B0038EBF0A88DAA08420FD3E66F53CC0CE"
+                  CertificateThumbprint="9DC17888B5CFAD98B3CB35C1994E96227F061675"
+                  Description="Microsoft .NET Framework 4.8 Setup"
+                  Hash="0D425249D42A01E7AB3AC243152FA7773C43F0BF"
+                  ProductName="Microsoft .NET Framework 4.8"
+                  Size="72721568"
+                  Version="4.8.3761.0" />
             </ExePackage>
         </PackageGroup>
     </Fragment>

diff --git a/Elucidate/Elucidate Windows Installer/Elucidate Windows Installer.wixproj b/Elucidate/Elucidate Windows Installer/Elucidate Windows Installer.wixproj
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProductVersion>3.5</ProductVersion>
+    <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>{ea76fde5-c6ae-46b7-ada4-f3dc9dccc9fb}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>Elucidate.Windows.Installer</OutputName>
     <OutputType>Package</OutputType>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-    <SccProjectName>SAK</SccProjectName>
-    <SccProvider>SAK</SccProvider>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
+    <SuppressAllWarnings>False</SuppressAllWarnings>
+    <Pedantic>True</Pedantic>
+    <VerboseOutput>True</VerboseOutput>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <SuppressAllWarnings>False</SuppressAllWarnings>
     <Pedantic>True</Pedantic>
-    <LeaveTemporaryFiles>False</LeaveTemporaryFiles>
+    <VerboseOutput>True</VerboseOutput>
     <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <ItemGroup>
@@ -65,13 +62,17 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
   <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
+    To modify your build process, add your task inside one of the targets below and uncomment it.
+    Other similar extension points exist, see Wix.targets.
+    <Target Name="BeforeBuild">
+    </Target>
+    <Target Name="AfterBuild">
+    </Target>
+    -->
 </Project>