Merge pull request #385 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

AddMSPApp/datto.app.xml

@@ -1,15 +1,15 @@
-<ApplicationInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ToolVersion="1.8.3.0">
-  <Name>install.ps1</Name>
-  <UnencryptedContentSize>705</UnencryptedContentSize>
-  <FileName>datto.intunewin</FileName>
-  <SetupFile>install.ps1</SetupFile>
-  <EncryptionInfo>
-    <EncryptionKey>sL/LP/JZ4F4cBSykm6usgJoV1PMoqd62C6JUwuo2z24=</EncryptionKey>
-    <MacKey>PEpeqeoX7jAWxb0xHGfCkKFxh4/YRfoMTVXrP+uZWzM=</MacKey>
-    <InitializationVector>ulFPA+vYjaxX0pvq0BMAKQ==</InitializationVector>
-    <Mac>28ZFU4AT1OznwF8pfqO8i+WFUNSf9024H4Jw2H7UJWs=</Mac>
-    <ProfileIdentifier>ProfileVersion1</ProfileIdentifier>
-    <FileDigest>YEb+QNQCko/uZyedA+JfcP/RDm+nZOIjFN04CfhwN4c=</FileDigest>
-    <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
-  </EncryptionInfo>
+<ApplicationInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ToolVersion="1.8.3.0">
+  <Name>install.ps1</Name>
+  <UnencryptedContentSize>693</UnencryptedContentSize>
+  <FileName>datto.intunewin</FileName>
+  <SetupFile>install.ps1</SetupFile>
+  <EncryptionInfo>
+    <EncryptionKey>jobB9Ga7J3CbO6acWJyvBRE56nFXwqGfcnGfZRMsJC4=</EncryptionKey>
+    <MacKey>53SOzs0l6Po2btsGFSMZgkV8vwhH+PxTN8BZDUcfWfg=</MacKey>
+    <InitializationVector>VjM/osrvPElbu79J+mdXuw==</InitializationVector>
+    <Mac>UZZXO53Np/tG6Ms+qvwLcNOeD1GRH6NRPFg/TuMz39M=</Mac>
+    <ProfileIdentifier>ProfileVersion1</ProfileIdentifier>
+    <FileDigest>KtAWAl29064LG0eyDinbDs0JUbK+EK7GsJovu8obBM4=</FileDigest>
+    <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
+  </EncryptionInfo>
 </ApplicationInfo>

AddMSPApp/datto.intunewin

@@ -0,0 +1,32 @@
+param(
+    $PackagePath,
+    $MetadataPath
+)
+
+# Example: .\tools\IntuneWin\Get-IntuneWinPackageContents.ps1 -PackagePath .\AddMSPApp\datto.intunewin -MetadataPath .\AddMSPApp\datto.app.xml
+
+$Metadata = [xml](Get-Content -Path $MetadataPath)
+$Encryption = $Metadata.ApplicationInfo.EncryptionInfo
+
+$Package = Get-Item $PackagePath
+
+Write-Host "Decrypting IntuneWin package $($Package.FullName)"
+Write-Host "Using encryption key: $($Encryption.EncryptionKey)"
+Write-Host "Using initialization vector: $($Encryption.InitializationVector)"
+
+$DecoderParams = @(
+    "`"$($Package.FullName)`""
+    "/key:`"$($Encryption.EncryptionKey)`""
+    "/iv:`"$($Encryption.InitializationVector)`""
+)
+
+Start-Process -FilePath "$PSScriptRoot\IntuneWinAppUtilDecoder.exe" -ArgumentList $DecoderParams -Wait -NoNewWindow
+# replace filename.intunewin with filename.decoded.zip
+$NewFileName = "$($Package.BaseName -replace '\.intunewin$', '').decoded.zip"
+
+#Extract zip
+Write-Host "Extracting decrypted IntuneWin package: $($Package.DirectoryName)\$NewFileName"
+Expand-Archive -Path "$($Package.DirectoryName)\$NewFileName" -DestinationPath "$($Package.DirectoryName)\$($Package.BaseName)" -Force
+
+# Remove the decoded zip file
+Remove-Item -Path "$($Package.DirectoryName)\$NewFileName" -Force

Tools/IntuneWin/Get-IntuneWinPackageContents.ps1

@@ -0,0 +1,58 @@
+param(
+    [Parameter(Mandatory = $true)]
+    [string]$SourcePath,
+    [Parameter(Mandatory = $true)]
+    [string]$FileName,
+    [Parameter(Mandatory = $true)]
+    [string]$MetadataFileName
+)
+
+# Example: .\Tools\IntuneWin\New-IntuneWinPackage.ps1 -SourcePath .\AddMSPApp\datto\ -FileName datto.intunewin -MetadataFileName datto.app.xml
+
+$Source = Get-Item -Path $SourcePath
+
+$Params = @(
+    "-c $SourcePath"
+    '-s install.ps1'
+    "-o $SourcePath"
+    '-q'
+)
+
+Start-Process -FilePath "$PSScriptRoot\IntuneWinAppUtil.exe" -ArgumentList $Params -Wait -NoNewWindow
+
+Expand-Archive -Path "$SourcePath\install.intunewin" -DestinationPath $SourcePath -Force
+Write-Host "IntuneWin package contents extracted to: $SourcePath"
+Remove-Item -Path "$SourcePath\install.intunewin" -Force
+Write-Host "Temporary IntuneWin package file removed from: $SourcePath\install.intunewin"
+
+# Extract IntunePackage.intunewin from Contents and move to the parent directory
+$IntunePackagePath = Join-Path $SourcePath 'IntuneWinPackage\Contents\IntunePackage.intunewin'
+if (Test-Path -Path $IntunePackagePath) {
+    Move-Item -Path $IntunePackagePath -Destination (Join-Path $Source.Parent.FullName $FileName) -Force
+    Write-Host "IntunePackage.intunewin moved to: $($Source.Parent.FullName)\$FileName"
+} else {
+    Write-Host 'IntunePackage.intunewin not found in Contents directory.'
+}
+
+# Copy the Metadata/Detection.xml file to the parent directory
+$DetectionFilePath = Join-Path $SourcePath 'IntuneWinPackage\Metadata\Detection.xml'
+
+if (Test-Path -Path $DetectionFilePath) {
+    $MetadataXml = [xml](Get-Content -Path $DetectionFilePath)
+    $MetadataXml.ApplicationInfo.FileName = $FileName
+    $MetadataXml.Save($DetectionFilePath)
+    Write-Host "Detection.xml updated with FileName: $FileName"
+} else {
+    Write-Host 'Detection.xml not found in Metadata directory.'
+}
+
+if (Test-Path -Path $DetectionFilePath) {
+    Copy-Item -Path $DetectionFilePath -Destination (Join-Path $Source.Parent.FullName $MetadataFileName) -Force
+    Write-Host "Detection.xml copied to: $($Source.Parent.FullName)\$MetadataFileName"
+} else {
+    Write-Host 'Detection.xml not found in Metadata directory.'
+}
+
+# Clean up the Source directory
+Remove-Item -Path $SourcePath -Recurse -Force
+Write-Host "Temporary files cleaned up from: $SourcePath"