Skip to content

Fixes #607 Bump xwin and win sdk to latest #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kristiankunc merged 4 commits into from
Mar 16, 2026
Merged

Fixes #607 Bump xwin and win sdk to latest #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5729d2a
chore: Bump xwin and win sdk to latest
kristiankunc Mar 16, 2026
307cbeb
chore: Add git setup to devcontainer
kristiankunc Mar 16, 2026
788b823
maintain old known working sdk version
kristiankunc Mar 16, 2026
d96dd75
Merge pull request #609 from VATSIM-UK/git-devcontainer
kristiankunc Mar 16, 2026
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
12 changes: 11 additions & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{
"name": "uk-controller-plugin",
"features": {
"ghcr.io/devcontainers/features/git:1": {}
},
"mounts": [
"source=${localEnv:HOME}/.ssh,target=/home/ubuntu/.ssh,type=bind,consistency=cached", // Linux
"source=${localEnv:USERPROFILE}/.ssh,target=/home/ubuntu/.ssh,type=bind,consistency=cached" // Windows
],
"build": {
"dockerfile": "../dockerfile"
}
},
"postCreateCommand": "git config --global --add safe.directory /workspaces/uk-controller-plugin",
"containerUser": "ubuntu",
"remoteUser": "ubuntu"
}
10 changes: 8 additions & 2 deletions dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ FROM ubuntu:24.04

ARG CURL_VERSION=7.62.0
ARG LLVM_VERSION=18
ARG XWIN_VERSION=0.6.5
ARG XWIN_VERSION=0.8.0
ARG XWIN_TRIPLE=x86_64-unknown-linux-musl
ARG WINDOWS_CRT_VERSION=14.29.16.11
ARG WINDOWS_SDK_VERSION=10.0.20348
# Old known working = 10.0.20348
ARG WINDOWS_SDK_VERSION=10.0.26100
Comment thread
kristiankunc marked this conversation as resolved.

ADD "https://github.com/Jake-Shadle/xwin/releases/download/${XWIN_VERSION}/xwin-${XWIN_VERSION}-${XWIN_TRIPLE}.tar.gz" \
/tmp/xwin.tar.gz
Expand All @@ -18,6 +19,8 @@ RUN <<-EOF
rm -r xwin.tar.gz xwin-*
EOF

RUN apt update && apt install -y --no-install-recommends ca-certificates && apt autoremove -y && apt clean -y
Comment thread
kristiankunc marked this conversation as resolved.

RUN xwin --accept-license --arch x86 \
--crt-version ${WINDOWS_CRT_VERSION} --sdk-version ${WINDOWS_SDK_VERSION} \
splat --output /opt/xwin --include-debug-libs
Expand All @@ -28,6 +31,7 @@ RUN <<-EOF
export DEBIAN_FRONTEND=noninteractive
apt update
apt install -y \
openssh-client \
build-essential cmake cppcheck gdb ninja-build valgrind \
clang-${LLVM_VERSION} clang-tools-${LLVM_VERSION} \
lld-${LLVM_VERSION} llvm-${LLVM_VERSION}
Expand Down Expand Up @@ -129,4 +133,6 @@ ENV CURL_INCLUDEDIR=/opt/curl/include/
ENV CURL_LIBRARYDIR=/opt/curl/build/lib/
ENV CURL_DEBUG_LIBRARYDIR=/opt/curl/build/lib/

USER ubuntu

CMD ["/bin/bash"]
Loading