Skip to content

Commit eb823e1

Browse files
lbusselllbussell
committed
Use combined reference assembly zip
1 parent 624787e commit eb823e1

File tree

12 files changed

+74
-129
lines changed

12 files changed

+74
-129
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-reference-assemblies")}}{{
10795
if OS_VERSION_NUMBER = "ltsc2019"
10896
:
10997

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{{
2+
3+
_ ARGS:
4+
usePowerShell: whether to use PowerShell ^
5+
6+
set version to "v0" ^
7+
8+
set url to cat(
9+
"https://github.com/lbussell/dotnet-framework-docker/releases/download/referenceassemblies-",
10+
version,
11+
"/referenceassemblies.",
12+
version,
13+
".zip"
14+
)
15+
16+
}}# Install Targeting Packs{{
17+
if ARGS.usePowerShell:
18+
RUN powershell " `
19+
$ErrorActionPreference = 'Stop'; `
20+
$ProgressPreference = 'SilentlyContinue'; `
21+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
22+
Invoke-WebRequest `
23+
-UseBasicParsing `
24+
-Uri {{url}} `
25+
-OutFile referenceassemblies.zip; `
26+
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
27+
Remove-Item -Force referenceassemblies.zip"^
28+
else:
29+
RUN curl -fSLo referenceassemblies.zip {{url}} `
30+
&& mkdir "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
31+
&& tar -xzf referenceassemblies.zip -C "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
32+
&& del referenceassemblies.zip}}

‎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-reference-assemblies", [ "usePowerShell": "true" ])}}
133120

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

‎src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,11 @@ RUN powershell " `
120120
$ErrorActionPreference = 'Stop'; `
121121
$ProgressPreference = 'SilentlyContinue'; `
122122
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
123-
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
124-
| %{ `
125-
Invoke-WebRequest `
126-
-UseBasicParsing `
127-
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
128-
-OutFile referenceassemblies.zip; `
129-
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
130-
Remove-Item -Force referenceassemblies.zip; `
131-
}"
123+
Invoke-WebRequest `
124+
-UseBasicParsing `
125+
-Uri https://github.com/lbussell/dotnet-framework-docker/releases/download/referenceassemblies-v0/referenceassemblies.v0.zip `
126+
-OutFile referenceassemblies.zip; `
127+
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
128+
Remove-Item -Force referenceassemblies.zip"
132129

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

‎src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,9 @@ RUN powershell setx /M PATH $(${Env:PATH} `
8686
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")
8787

8888
# Install Targeting Packs
89-
RUN powershell " `
90-
$ErrorActionPreference = 'Stop'; `
91-
$ProgressPreference = 'SilentlyContinue'; `
92-
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
93-
| %{ `
94-
Invoke-WebRequest `
95-
-UseBasicParsing `
96-
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
97-
-OutFile referenceassemblies.zip; `
98-
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
99-
Remove-Item -Force referenceassemblies.zip; `
100-
}"
89+
RUN curl -fSLo referenceassemblies.zip https://github.com/lbussell/dotnet-framework-docker/releases/download/referenceassemblies-v0/referenceassemblies.v0.zip `
90+
&& mkdir "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
91+
&& tar -xzf referenceassemblies.zip -C "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
92+
&& del referenceassemblies.zip
10193

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

‎src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,7 @@ RUN powershell setx /M PATH $(${Env:PATH} `
6868
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")
6969

7070
# Install Targeting Packs
71-
RUN powershell " `
72-
$ErrorActionPreference = 'Stop'; `
73-
$ProgressPreference = 'SilentlyContinue'; `
74-
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
75-
| %{ `
76-
Invoke-WebRequest `
77-
-UseBasicParsing `
78-
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
79-
-OutFile referenceassemblies.zip; `
80-
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
81-
Remove-Item -Force referenceassemblies.zip; `
82-
}"
71+
RUN curl -fSLo referenceassemblies.zip https://github.com/lbussell/dotnet-framework-docker/releases/download/referenceassemblies-v0/referenceassemblies.v0.zip `
72+
&& mkdir "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
73+
&& tar -xzf referenceassemblies.zip -C "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
74+
&& del referenceassemblies.zip

‎src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,7 @@ RUN powershell setx /M PATH $(${Env:PATH} `
6868
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")
6969

7070
# Install Targeting Packs
71-
RUN powershell " `
72-
$ErrorActionPreference = 'Stop'; `
73-
$ProgressPreference = 'SilentlyContinue'; `
74-
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
75-
| %{ `
76-
Invoke-WebRequest `
77-
-UseBasicParsing `
78-
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
79-
-OutFile referenceassemblies.zip; `
80-
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
81-
Remove-Item -Force referenceassemblies.zip; `
82-
}"
71+
RUN curl -fSLo referenceassemblies.zip https://github.com/lbussell/dotnet-framework-docker/releases/download/referenceassemblies-v0/referenceassemblies.v0.zip `
72+
&& mkdir "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
73+
&& tar -xzf referenceassemblies.zip -C "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
74+
&& del referenceassemblies.zip

‎src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,7 @@ RUN powershell setx /M PATH $(${Env:PATH} `
6868
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")
6969

7070
# Install Targeting Packs
71-
RUN powershell " `
72-
$ErrorActionPreference = 'Stop'; `
73-
$ProgressPreference = 'SilentlyContinue'; `
74-
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
75-
| %{ `
76-
Invoke-WebRequest `
77-
-UseBasicParsing `
78-
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
79-
-OutFile referenceassemblies.zip; `
80-
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
81-
Remove-Item -Force referenceassemblies.zip; `
82-
}"
71+
RUN curl -fSLo referenceassemblies.zip https://github.com/lbussell/dotnet-framework-docker/releases/download/referenceassemblies-v0/referenceassemblies.v0.zip `
72+
&& mkdir "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
73+
&& tar -xzf referenceassemblies.zip -C "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
74+
&& del referenceassemblies.zip

‎src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,7 @@ RUN powershell setx /M PATH $(${Env:PATH} `
6868
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")
6969

7070
# Install Targeting Packs
71-
RUN powershell " `
72-
$ErrorActionPreference = 'Stop'; `
73-
$ProgressPreference = 'SilentlyContinue'; `
74-
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
75-
| %{ `
76-
Invoke-WebRequest `
77-
-UseBasicParsing `
78-
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
79-
-OutFile referenceassemblies.zip; `
80-
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
81-
Remove-Item -Force referenceassemblies.zip; `
82-
}"
71+
RUN curl -fSLo referenceassemblies.zip https://github.com/lbussell/dotnet-framework-docker/releases/download/referenceassemblies-v0/referenceassemblies.v0.zip `
72+
&& mkdir "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
73+
&& tar -xzf referenceassemblies.zip -C "%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework" `
74+
&& del referenceassemblies.zip

‎src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,11 @@ RUN powershell " `
8888
$ErrorActionPreference = 'Stop'; `
8989
$ProgressPreference = 'SilentlyContinue'; `
9090
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
91-
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
92-
| %{ `
93-
Invoke-WebRequest `
94-
-UseBasicParsing `
95-
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
96-
-OutFile referenceassemblies.zip; `
97-
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
98-
Remove-Item -Force referenceassemblies.zip; `
99-
}"
91+
Invoke-WebRequest `
92+
-UseBasicParsing `
93+
-Uri https://github.com/lbussell/dotnet-framework-docker/releases/download/referenceassemblies-v0/referenceassemblies.v0.zip `
94+
-OutFile referenceassemblies.zip; `
95+
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
96+
Remove-Item -Force referenceassemblies.zip"
10097

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

0 commit comments

Comments
 (0)