Skip to content

Commit b9fcbf8

Browse files
committed
Do all cleanup at once
1 parent 58a6198 commit b9fcbf8

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

eng/dockerfile-templates/sdk/Dockerfile.install-reference-assemblies

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ RUN powershell -Command "`
2020
Where-Object { $_.FullName -match '@^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
2121
Remove-Item; `
2222
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
23-
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
24-
}"
23+
} `
24+
Remove-Item -Force -Recurse ${Env:TEMP}\\*;"

src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ RUN powershell -Command "`
128128
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
129129
Remove-Item; `
130130
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
131-
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
132-
}"
131+
} `
132+
Remove-Item -Force -Recurse ${Env:TEMP}\\*;"
133133

134134
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RUN powershell -Command "`
9898
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
9999
Remove-Item; `
100100
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
101-
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
102-
}"
101+
} `
102+
Remove-Item -Force -Recurse ${Env:TEMP}\\*;"
103103

104104
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ RUN powershell -Command "`
8080
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
8181
Remove-Item; `
8282
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
83-
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
84-
}"
83+
} `
84+
Remove-Item -Force -Recurse ${Env:TEMP}\\*;"

src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ RUN powershell -Command "`
8080
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
8181
Remove-Item; `
8282
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
83-
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
84-
}"
83+
} `
84+
Remove-Item -Force -Recurse ${Env:TEMP}\\*;"

src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ RUN powershell -Command "`
8080
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
8181
Remove-Item; `
8282
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
83-
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
84-
}"
83+
} `
84+
Remove-Item -Force -Recurse ${Env:TEMP}\\*;"

src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ RUN powershell -Command "`
8080
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
8181
Remove-Item; `
8282
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
83-
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
84-
}"
83+
} `
84+
Remove-Item -Force -Recurse ${Env:TEMP}\\*;"

src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ RUN powershell -Command "`
9696
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
9797
Remove-Item; `
9898
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
99-
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
100-
}"
99+
} `
100+
Remove-Item -Force -Recurse ${Env:TEMP}\\*;"
101101

102102
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ RUN powershell -Command "`
7979
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
8080
Remove-Item; `
8181
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
82-
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
83-
}"
82+
} `
83+
Remove-Item -Force -Recurse ${Env:TEMP}\\*;"
8484

8585
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

src/sdk/4.8/windowsservercore-ltsc2022/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ RUN powershell -Command "`
8080
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
8181
Remove-Item; `
8282
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
83-
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
84-
}"
83+
} `
84+
Remove-Item -Force -Recurse ${Env:TEMP}\\*;"

0 commit comments

Comments
 (0)