Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implemented missing Win32 app features #27

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Implemented missing Win32 app features #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0dc1e4f
Update New-Win32App.ps1
ChristianOe Nov 1, 2024
b21292d
Update App.json with new Features
ChristianOe Nov 1, 2024
eddba2c
Update App.json with new Features
ChristianOe Nov 1, 2024
daa84df
Update App.json with new Features
ChristianOe Nov 1, 2024
65ea545
Update App.json
ChristianOe Nov 1, 2024
1f81e3b
Update App.json
ChristianOe Nov 1, 2024
c3e8164
Update App.json
ChristianOe Nov 1, 2024
f9e3368
Update App.json
ChristianOe Nov 1, 2024
175a83d
Update New-Win32App.ps1
ChristianOe Nov 1, 2024
6f0eb5a
Update New-Win32App.ps1
ChristianOe Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Apps/7Zip/App.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,22 @@
"AppVersion": "<replaced_by_pipeline>",
"Description": "Install 7-Zip",
"Publisher": "<replaced_by_pipeline>",
"Developer": "",
"Notes": "",
"Owner": "",
"InformationURL": "",
"PrivacyURL": "",
"CompanyPortalFeaturedApp": false,
"CategoryName": [""],
"Owner": ""
"ScopeTagName": ""
},
"Program": {
"InstallCommand": "Deploy-Application.exe Install",
"UninstallCommand": "Deploy-Application.exe Uninstall",
"InstallExperience": "system",
"DeviceRestartBehavior": "suppress"
"DeviceRestartBehavior": "suppress",
"MaximumInstallationTimeInMinutes": "60",
"AllowAvailableUninstall": "true"
},
"RequirementRule": {
"MinimumSupportedWindowsRelease": "W10_22H2",
Expand Down Expand Up @@ -57,4 +64,4 @@
"RestartNotificationSnoozeInMinutes": ""
}
]
}
}
13 changes: 10 additions & 3 deletions Apps/NotepadPlusPlus/App.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,22 @@
"AppVersion": "<replaced_by_pipeline>",
"Description": "Install Notepad++",
"Publisher": "<replaced_by_pipeline>",
"Developer": "",
"Notes": "",
"Owner": "",
"InformationURL": "",
"PrivacyURL": "",
"CompanyPortalFeaturedApp": false,
"CategoryName": [""],
"Owner": ""
"ScopeTagName": ""
},
"Program": {
"InstallCommand": "Deploy-Application.exe Install",
"UninstallCommand": "Deploy-Application.exe Uninstall",
"InstallExperience": "system",
"DeviceRestartBehavior": "suppress"
"DeviceRestartBehavior": "suppress",
"MaximumInstallationTimeInMinutes": "60",
"AllowAvailableUninstall": "true"
},
"RequirementRule": {
"MinimumSupportedWindowsRelease": "W10_22H2",
Expand Down Expand Up @@ -57,4 +64,4 @@
"RestartNotificationSnoozeInMinutes": ""
}
]
}
}
13 changes: 10 additions & 3 deletions Apps/VLC/App.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,22 @@
"AppVersion": "<replaced_by_pipeline>",
"Description": "Install VLC",
"Publisher": "<replaced_by_pipeline>",
"Developer": "",
"Notes": "",
"Owner": "",
"InformationURL": "",
"PrivacyURL": "",
"CompanyPortalFeaturedApp": false,
"CategoryName": [""],
"Owner": ""
"ScopeTagName": ""
},
"Program": {
"InstallCommand": "Deploy-Application.exe Install",
"UninstallCommand": "Deploy-Application.exe Uninstall",
"InstallExperience": "system",
"DeviceRestartBehavior": "suppress"
"DeviceRestartBehavior": "suppress",
"MaximumInstallationTimeInMinutes": "60",
"AllowAvailableUninstall": "true"
},
"RequirementRule": {
"MinimumSupportedWindowsRelease": "W10_22H2",
Expand Down Expand Up @@ -54,4 +61,4 @@
"RestartNotificationSnoozeInMinutes": ""
}
]
}
}
23 changes: 21 additions & 2 deletions Scripts/New-Win32App.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
Author: Nickolaj Andersen
Contact: @NickolajA
Created: 2022-04-20
Updated: 2024-03-04
Updated: 2024-11-01

Version history:
1.0.0 - (2020-09-26) Script created
1.0.1 - (2023-05-29) Fixed bugs mention in release notes for Intune App Factory 1.0.1
1.0.2 - (2024-03-04) Added support for ScopeTagName parameter, added Assignment handling
1.0.3 - (2024-11-01) Added support for the parameter CompanyPortalFeaturedApp, CategoryName, Developer, InformationURL, PrivacyURL and MaximumInstallationTimeInMinutes
#>
[CmdletBinding(SupportsShouldProcess = $true)]
param (
Expand Down Expand Up @@ -591,15 +592,33 @@ Process {
if (-not([string]::IsNullOrEmpty($AppData.Information.Owner))) {
$Win32AppArgs.Add("Owner", $AppData.Information.Owner)
}
if (-not([string]::IsNullOrEmpty($AppData.Information.Developer))) {
$Win32AppArgs.Add("Developer", $AppData.Information.Developer)
}
if (-not([string]::IsNullOrEmpty($AppData.Information.Notes))) {
$Win32AppArgs.Add("Notes", $AppData.Information.Notes)
}
if (-not([string]::IsNullOrEmpty($AppData.Information.InformationURL))) {
$Win32AppArgs.Add("InformationURL", $AppData.Information.InformationURL)
}
if (-not([string]::IsNullOrEmpty($AppData.Information.PrivacyURL))) {
$Win32AppArgs.Add("PrivacyURL", $AppData.Information.PrivacyURL)
}
if (-not([string]::IsNullOrEmpty($AppData.Information.CompanyPortalFeaturedApp))) {
$Win32AppArgs.Add("CompanyPortalFeaturedApp", [System.Convert]::ToBoolean($AppData.Information.CompanyPortalFeaturedApp))
}
if (-not([string]::IsNullOrEmpty($AppData.Information.CategoryName))) {
$Win32AppArgs.Add("CategoryName", $AppData.Information.CategoryName)
}
if (-not([string]::IsNullOrEmpty($AppData.Program.InstallCommand))) {
$Win32AppArgs.Add("InstallCommandLine", $AppData.Program.InstallCommand)
}
if (-not([string]::IsNullOrEmpty($AppData.Program.UninstallCommand))) {
$Win32AppArgs.Add("UninstallCommandLine", $AppData.Program.UninstallCommand)
}
if ((-not([string]::IsNullOrEmpty($AppData.Program.MaximumInstallationTimeInMinutes))) -and ($AppData.Program.MaximumInstallationTimeInMinutes -match "^[\d\.]+$") -and ([int]$AppData.Program.MaximumInstallationTimeInMinutes -ge 1) -and ([int]$AppData.Program.MaximumInstallationTimeInMinutes -le 1440)){
$Win32AppArgs.Add("MaximumInstallationTimeInMinutes", [int]$AppData.Program.MaximumInstallationTimeInMinutes)
}
if (-not([string]::IsNullOrEmpty($AppData.Program.AllowAvailableUninstall))) {
if ($AppData.Program.AllowAvailableUninstall -eq $true) {
$Win32AppArgs.Add("AllowAvailableUninstall", $true)
Expand Down Expand Up @@ -679,4 +698,4 @@ Process {
Write-Output -InputObject "Failed to locate required $($AppsPublishListFileName) file in build artifacts staging directory, aborting pipeline"
Write-Output -InputObject "##vso[task.setvariable variable=shouldrun;isOutput=true]false"
}
}
}