Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions eng/dockerfile-templates/sdk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,7 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX {{sdkVersion}} Tools\" `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
@@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
-OutFile referenceassemblies.zip; `
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
Remove-Item -Force referenceassemblies.zip; `
}"{{
{{InsertTemplate("Dockerfile.install-reference-assemblies")}}{{
if OS_VERSION_NUMBER = "ltsc2019"
:

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{{
set wrap(s) to:{{return cat("'", s, "'")}} ^

set versions to ["net40", "net45", "net451", "net452", "net46", "net461", "net462", "net47", "net471", "net472", "net48", "net481"] ^
set versions to map(versions, wrap) ^

set packageVersion to VARIABLES["referenceassemblies|version"] ^
set packageInstallDir to "packages"

}}# Install Targeting Packs
RUN powershell -Command "`
New-Item -ItemType Directory -Path \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
foreach ($version in @@({{join(versions, ", ")}})) { `
# Download reference assembly NuGet package `
$package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; `
NuGet install \"${package}\" -DirectDownload -ExcludeVersion -Version {{packageVersion}} -OutputDirectory ${Env:TEMP}\Packages; `
$contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; `
# Remove Intellisense files `
Get-ChildItem -File -Recurse -Path \"${contents}\" | `
Where-Object { $_.FullName -match '@^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
Remove-Item; `
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
}"
15 changes: 1 addition & 14 deletions eng/dockerfile-templates/sdk/Dockerfile.ltsc2016
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,6 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\" `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
@@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
-OutFile referenceassemblies.zip; `
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
Remove-Item -Force referenceassemblies.zip; `
}"
{{InsertTemplate("Dockerfile.install-reference-assemblies")}}

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
1 change: 1 addition & 0 deletions manifest.versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"lcu|ltsc2025|default": "$(lcu|ltsc2025|4.8.1)",

"nuget|version": "6.12.2",
"referenceassemblies|version": "1.0.3",

"servicemonitor|version": "2.0.1.10",
"servicemonitor|url": "https://dotnetbinaries.blob.core.windows.net/servicemonitor/$(servicemonitor|version)/ServiceMonitor.exe",
Expand Down
25 changes: 13 additions & 12 deletions src/sdk/3.5/windowsservercore-ltsc2016/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,19 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
-OutFile referenceassemblies.zip; `
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
Remove-Item -Force referenceassemblies.zip; `
RUN powershell -Command "`
New-Item -ItemType Directory -Path \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { `
# Download reference assembly NuGet package `
$package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; `
NuGet install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; `
$contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; `
# Remove Intellisense files `
Get-ChildItem -File -Recurse -Path \"${contents}\" | `
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
Remove-Item; `
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
}"

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
24 changes: 13 additions & 11 deletions src/sdk/3.5/windowsservercore-ltsc2019/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,19 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
-OutFile referenceassemblies.zip; `
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
Remove-Item -Force referenceassemblies.zip; `
RUN powershell -Command "`
New-Item -ItemType Directory -Path \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { `
# Download reference assembly NuGet package `
$package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; `
NuGet install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; `
$contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; `
# Remove Intellisense files `
Get-ChildItem -File -Recurse -Path \"${contents}\" | `
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
Remove-Item; `
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
}"

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
24 changes: 13 additions & 11 deletions src/sdk/3.5/windowsservercore-ltsc2022/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,17 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
-OutFile referenceassemblies.zip; `
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
Remove-Item -Force referenceassemblies.zip; `
RUN powershell -Command "`
New-Item -ItemType Directory -Path \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { `
# Download reference assembly NuGet package `
$package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; `
NuGet install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; `
$contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; `
# Remove Intellisense files `
Get-ChildItem -File -Recurse -Path \"${contents}\" | `
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
Remove-Item; `
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
}"
24 changes: 13 additions & 11 deletions src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,17 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
-OutFile referenceassemblies.zip; `
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
Remove-Item -Force referenceassemblies.zip; `
RUN powershell -Command "`
New-Item -ItemType Directory -Path \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { `
# Download reference assembly NuGet package `
$package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; `
NuGet install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; `
$contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; `
# Remove Intellisense files `
Get-ChildItem -File -Recurse -Path \"${contents}\" | `
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
Remove-Item; `
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
}"
24 changes: 13 additions & 11 deletions src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,17 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
-OutFile referenceassemblies.zip; `
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
Remove-Item -Force referenceassemblies.zip; `
RUN powershell -Command "`
New-Item -ItemType Directory -Path \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { `
# Download reference assembly NuGet package `
$package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; `
NuGet install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; `
$contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; `
# Remove Intellisense files `
Get-ChildItem -File -Recurse -Path \"${contents}\" | `
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
Remove-Item; `
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
}"
24 changes: 13 additions & 11 deletions src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,17 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
-OutFile referenceassemblies.zip; `
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
Remove-Item -Force referenceassemblies.zip; `
RUN powershell -Command "`
New-Item -ItemType Directory -Path \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { `
# Download reference assembly NuGet package `
$package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; `
NuGet install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; `
$contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; `
# Remove Intellisense files `
Get-ChildItem -File -Recurse -Path \"${contents}\" | `
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
Remove-Item; `
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
}"
25 changes: 13 additions & 12 deletions src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,19 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
-OutFile referenceassemblies.zip; `
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
Remove-Item -Force referenceassemblies.zip; `
RUN powershell -Command "`
New-Item -ItemType Directory -Path \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { `
# Download reference assembly NuGet package `
$package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; `
NuGet install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; `
$contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; `
# Remove Intellisense files `
Get-ChildItem -File -Recurse -Path \"${contents}\" | `
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
Remove-Item; `
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
}"

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
24 changes: 13 additions & 11 deletions src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,19 @@ RUN powershell setx /M PATH $(${Env:PATH} `
+ \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")

# Install Targeting Packs
RUN powershell " `
$ErrorActionPreference = 'Stop'; `
$ProgressPreference = 'SilentlyContinue'; `
@('4.0', '4.5.2', '4.6.2', '4.7.2', '4.8', '4.8.1') `
| %{ `
Invoke-WebRequest `
-UseBasicParsing `
-Uri https://dotnetbinaries.blob.core.windows.net/referenceassemblies/v${_}.zip `
-OutFile referenceassemblies.zip; `
Expand-Archive referenceassemblies.zip -DestinationPath \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
Remove-Item -Force referenceassemblies.zip; `
RUN powershell -Command "`
New-Item -ItemType Directory -Path \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\.NETFramework\"; `
foreach ($version in @('net40', 'net45', 'net451', 'net452', 'net46', 'net461', 'net462', 'net47', 'net471', 'net472', 'net48', 'net481')) { `
# Download reference assembly NuGet package `
$package = \"Microsoft.NETFramework.ReferenceAssemblies.${version}\"; `
NuGet install \"${package}\" -DirectDownload -ExcludeVersion -Version 1.0.3 -OutputDirectory ${Env:TEMP}\Packages; `
$contents = \"${Env:TEMP}\Packages\${package}\build\.NETFramework\"; `
# Remove Intellisense files `
Get-ChildItem -File -Recurse -Path \"${contents}\" | `
Where-Object { $_.FullName -match '^(?!.*\\\\(PermissionSets|RedistList)\\\\).*\\.xml$' } | `
Remove-Item; `
Copy-Item -Recurse -Force -Container -Path ${contents} -Destination \"${Env:ProgramFiles(x86)}\Reference Assemblies\Microsoft\Framework\"; `
Remove-Item -Force -Recurse ${Env:TEMP}\\*; `
}"

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