Skip to content

Commit 9b09bf1

Browse files
committed
ci: windows docker images uses Windows10SDK 19041 and msvc 142
1 parent 17f91c6 commit 9b09bf1

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

scripts/resources/windows/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARG chocolateyVersion
1919
FROM ${FROM_IMAGE} AS certsgen
2020
RUN certutil -generateSSTFromWU roots.sst
2121

22-
FROM ${FROM_IMAGE} AS CHOCOLATEY_BASE
22+
FROM ${FROM_IMAGE} AS chocolatey_base
2323

2424
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
2525

@@ -59,13 +59,13 @@ RUN C:\ProgramData\chocolatey\bin\choco.exe sources ; `
5959
{ `
6060
throw 'nasm.exe not found' ; `
6161
}; `
62+
uv python update-shell ; `
6263
Write-Host "Finished install packages with Chocolatey"
6364

64-
6565
RUN New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" `
6666
-Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
6767

68-
FROM CHOCOLATEY_BASE AS CONAN_BUILDER
68+
FROM chocolatey_base AS conan_builder
6969
ARG CONAN_HOME
7070

7171
ARG PIP_INDEX_URL
@@ -96,14 +96,14 @@ RUN uvx --with cmake conan profile detect --exist-ok ; `
9696
}
9797
# ==============================================================================
9898

99-
FROM CHOCOLATEY_BASE
99+
FROM chocolatey_base
100100
COPY --from=certsgen c:/roots.sst roots.sst
101101
RUN certutil -addstore -f root roots.sst ; `
102102
del roots.sst
103103

104104
ARG CONAN_USER_HOME
105105
ARG CONAN_HOME
106-
COPY --from=CONAN_BUILDER ${CONAN_HOME}/ ${CONAN_HOME}/
106+
COPY --from=conan_builder ${CONAN_HOME}/ ${CONAN_HOME}/
107107
ARG UV_CACHE_DIR
108108
ARG PIP_DOWNLOAD_CACHE
109109

scripts/resources/windows/msvc/visual_studio_config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"version": "1.0",
33
"components": [
44
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
5-
"Microsoft.VisualStudio.Component.Windows10SDK.18362"
5+
"Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64",
6+
"Microsoft.VisualStudio.Component.Windows10SDK.19041"
67
],
78
"extensions": []
89
}

0 commit comments

Comments
 (0)