Skip to content

Commit 1ae14ec

Browse files
committed
Factor out reference assembly installation
1 parent cada308 commit 1ae14ec

File tree

3 files changed

+17
-27
lines changed

3 files changed

+17
-27
lines changed

eng/dockerfile-templates/sdk/Dockerfile

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,7 @@ RUN powershell setx /M PATH $(${Env:PATH} `
9191
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX {{sdkVersion}} Tools\" `
9292
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")
9393

94-
# Install Targeting Packs
95-
RUN powershell " `
96-
$ErrorActionPreference = 'Stop'; `
97-
$ProgressPreference = 'SilentlyContinue'; `
98-
@@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
99-
| %{ `
100-
Invoke-WebRequest `
101-
-UseBasicParsing `
102-
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
103-
-OutFile referenceassemblies.zip; `
104-
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
105-
Remove-Item -Force referenceassemblies.zip; `
106-
}"{{
94+
{{InsertTemplate("Dockerfile.install-refassemblies")}}{{
10795
if OS_VERSION_NUMBER = "ltsc2019"
10896
:
10997

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Install Targeting Packs
2+
RUN powershell " `
3+
$ErrorActionPreference = 'Stop'; `
4+
$ProgressPreference = 'SilentlyContinue'; `
5+
{{if OS_VERSION_NUMBER = "ltsc2016"
6+
:[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
7+
}}@@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
8+
| %{ `
9+
Invoke-WebRequest `
10+
-UseBasicParsing `
11+
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
12+
-OutFile referenceassemblies.zip; `
13+
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
14+
Remove-Item -Force referenceassemblies.zip; `
15+
}"

eng/dockerfile-templates/sdk/Dockerfile.ltsc2016

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,6 @@ RUN powershell setx /M PATH $(${Env:PATH} `
116116
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\" `
117117
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")
118118

119-
# Install Targeting Packs
120-
RUN powershell " `
121-
$ErrorActionPreference = 'Stop'; `
122-
$ProgressPreference = 'SilentlyContinue'; `
123-
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
124-
@@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
125-
| %{ `
126-
Invoke-WebRequest `
127-
-UseBasicParsing `
128-
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
129-
-OutFile referenceassemblies.zip; `
130-
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
131-
Remove-Item -Force referenceassemblies.zip; `
132-
}"
119+
{{InsertTemplate("Dockerfile.install-refassemblies")}}
133120

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

0 commit comments

Comments
 (0)