Merge remote-tracking branch 'winehq/main' into wine-mono

madewokherd · Apr 26, 2024 · 57ce413 · 57ce413
2 parents 67b37b3 + ab47e7b
commit 57ce413
Show file tree

Hide file tree

Showing 6 changed files with 377 additions and 330 deletions.
diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <fallbackPackageFolders>
+    <clear />
+  </fallbackPackageFolders>
+  <packageSources>
+    <clear />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+</configuration>
+
diff --git a/scripts/ci/linux-test.docker b/scripts/ci/linux-test.docker
@@ -11,7 +11,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     echo 'exit 101' >> /usr/sbin/policy-rc.d && \
     chmod +x /usr/sbin/policy-rc.d && \
     apt-get update && \
-    apt-get install -y git ca-certificates wget binutils iputils-ping libgdiplus unzip && \
+    apt-get install -y git ca-certificates wget binutils iputils-ping libgdiplus unzip xinit fvwm xserver-xorg-video-dummy xserver-xorg xfonts-base && \
     apt-get clean && \
     useradd -m gitlab