From 0cb66802c63caae115466b1150e8e3dfceebae7c Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis.saettler@wolterskluwer.com>
Date: Wed, 9 Nov 2022 10:21:18 +0100
Subject: [PATCH] [Windows] Clean install_user Temp directory (#6529)

---
 images/win/scripts/Installers/Finalize-VM.ps1 | 1 +
 images/win/windows2019.json                   | 3 +++
 images/win/windows2022.json                   | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/images/win/scripts/Installers/Finalize-VM.ps1 b/images/win/scripts/Installers/Finalize-VM.ps1
index be5200b9b..21f5f8811 100644
--- a/images/win/scripts/Installers/Finalize-VM.ps1
+++ b/images/win/scripts/Installers/Finalize-VM.ps1
@@ -19,6 +19,7 @@ Write-Host "Clean up various directories"
     "$env:SystemRoot\logs",
     "$env:SystemRoot\winsxs\manifestcache",
     "$env:SystemRoot\Temp",
+    "$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp",
     "$env:TEMP"
 ) | ForEach-Object {
     if (Test-Path $_) {
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index f2a50f970..c66c0a214 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -314,6 +314,9 @@
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Run-NGen.ps1",
                 "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1"
+            ],
+            "environment_vars": [
+                "INSTALL_USER={{user `install_user`}}"
             ]
         },
         {
diff --git a/images/win/windows2022.json b/images/win/windows2022.json
index 122882a14..ea4889dc2 100644
--- a/images/win/windows2022.json
+++ b/images/win/windows2022.json
@@ -318,6 +318,9 @@
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Run-NGen.ps1",
                 "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1"
+            ],
+            "environment_vars": [
+                "INSTALL_USER={{user `install_user`}}"
             ]
         },
         {