Skip to content

Commit

Permalink
Updated with Requirements Rules working
Browse files Browse the repository at this point in the history 
Updated all recipes with requirements rules to use new requirements rules features.
  • Loading branch information
@asjimene
asjimene committed Dec 24, 2019
1 parent 5b3d552 commit 000d560
Show file tree
Hide file tree
Showing 19 changed files with 330 additions and 92 deletions.
12 changes: 9 additions & 3 deletions Disabled/7-Zip.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,15 @@
<MaxRuntimeMins>15</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>7Zip Silent Install x86</DeploymentTypeName>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/AmazonCorretto8.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,15 @@
<MaxRuntimeMins>30</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>Amazon Corretto x86</DeploymentTypeName>
Expand Down
32 changes: 25 additions & 7 deletions Disabled/DellBIOSProvider.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,22 @@
<DetectionMethodType>CustomScript</DetectionMethodType>
<ScriptLanguage>PowerShell</ScriptLanguage>
<DetectionMethod>if ((get-module DellBIOSProvider -ListAvailable).Version -ge [version]"$Version"){write-Output "Installed"}</DetectionMethod>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
<RuleName>Existential of AutoPackage - DellBIOSProvider Prereq Check Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - DellBIOSProvider Prereq Check</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>Dell Command Powershell Provider 32-bit</DeploymentTypeName>
Expand All @@ -71,9 +83,15 @@
<DetectionMethodType>CustomScript</DetectionMethodType>
<ScriptLanguage>PowerShell</ScriptLanguage>
<DetectionMethod>if ((get-module DellBIOSProviderX86 -ListAvailable).Version -ge [version]"$Version"){write-Output "Installed"}</DetectionMethod>
<Requirements>
<RuleName>Existential of AutoPackage - DellBIOSProvider Prereq Check Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - DellBIOSProvider Prereq Check</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
</DeploymentTypes>
<Distribution>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/FirefoxQuantumESR.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,15 @@
<Is64Bit>True</Is64Bit>
</DetectionClause>
</CustomDetectionMethods>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>Firefox Quantum ESR x86 Silent Install</DeploymentTypeName>
Expand Down
13 changes: 10 additions & 3 deletions Disabled/FlashPlayerActiveX.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,16 @@ $ProductCode = $LatestFlash.ParentNode.MsiInstallerData.ProductCode</PrefetchScr
<MaxRuntimeMins>60</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Operating system None of</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>OperatingSystem</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>Windows/All_x64_Windows_10_and_higher_Clients</RuleValue>
<RuleValue>Windows/All_x86_Windows_10_and_higher_Clients</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleOperator>OneOf</RequirementsRuleOperator>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
</DeploymentTypes>
<Distribution>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/Git.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,15 @@
<Value>True</Value>
</DetectionClause>
</CustomDetectionMethods>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>Git x86</DeploymentTypeName>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/Google Earth Pro.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,15 @@
<MaxRuntimeMins>45</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>Google Earth Pro Silent Install x86</DeploymentTypeName>
Expand Down
4 changes: 3 additions & 1 deletion Disabled/GoogleChrome.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>True</RequirementsRuleValue>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/MicrosoftPowerBI.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,15 @@
<MaxRuntimeMins>45</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>Silent Installer for Microsoft PowerBI Desktop x86</DeploymentTypeName>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/MicrosoftPowerBIRS.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,15 @@
<MaxRuntimeMins>45</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>Silent Installer for Microsoft PowerBI Desktop RS x86</DeploymentTypeName>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/MicrosoftTeams.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,15 @@
<MaxRuntimeMins>30</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType1">
<DeploymentTypeName>Microsoft Teams x86 Install</DeploymentTypeName>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/Opera.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,15 @@
<Is64Bit>True</Is64Bit>
</DetectionClause>
</CustomDetectionMethods>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>Opera Browser x86 Silent Install</DeploymentTypeName>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/RoyalTS.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,15 @@
<MaxRuntimeMins>30</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
</DeploymentTypes>
<Distribution>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/VisualStudioCode.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,15 @@
<Value>True</Value>
</DetectionClause>
</CustomDetectionMethods>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>Visual Studio Code x86</DeploymentTypeName>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/Wireshark.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,15 @@
<MaxRuntimeMins>30</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
</DeploymentTypes>
<Distribution>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/iTunes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,15 @@
<MaxRuntimeMins>30</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
<InstallBehavior>
<InstallBehaviorProcess DisplayName="iTunes">
<InstallBehaviorExe>iTunes.exe</InstallBehaviorExe>
Expand Down
12 changes: 9 additions & 3 deletions Disabled/putty.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,15 @@
<MaxRuntimeMins>15</MaxRuntimeMins>
<RebootBehavior>BasedOnExitCode</RebootBehavior>
<DetectionMethodType>MSI</DetectionMethodType>
<Requirements>
<RuleName>Existential of AutoPackage - OSArchitecture x64 Not Equal to 0</RuleName>
</Requirements>
<RequirementsRules>
<RequirementsRule>
<RequirementsRuleType>Existential</RequirementsRuleType>
<RequirementsRuleValue>
<RuleValue>True</RuleValue>
</RequirementsRuleValue>
<RequirementsRuleGlobalCondition>AutoPackage - OSArchitecture x64</RequirementsRuleGlobalCondition>
</RequirementsRule>
</RequirementsRules>
</DeploymentType>
<DeploymentType Name="DeploymentType2">
<DeploymentTypeName>PuTTY Silent Install x86</DeploymentTypeName>
Expand Down
Loading

0 comments on commit 000d560

Please sign in to comment.