From 5ba8f4f453f79b7beae750b42a3459d19b34cb44 Mon Sep 17 00:00:00 2001
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Date: Sun, 8 Dec 2024 12:35:03 +0100
Subject: [PATCH] f'up to "Windows 7-8.1 support was removed, prevent install
 on these old systems"

ucrts are no longer added to the installation sets and the corresponding
configure switch has been removed as well.

Change-Id: I484c65c6109572ddd31738e91fcc798575508a7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178076
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
---
 .configurations/admin_java_and_deps.dsc.yaml |  9 ---------
 .configurations/user_steps.dsc.yaml          | 12 ------------
 2 files changed, 21 deletions(-)

diff --git a/.configurations/admin_java_and_deps.dsc.yaml b/.configurations/admin_java_and_deps.dsc.yaml
index 2d1f0b7eac77..2a417623989a 100644
--- a/.configurations/admin_java_and_deps.dsc.yaml
+++ b/.configurations/admin_java_and_deps.dsc.yaml
@@ -61,15 +61,6 @@ properties:
         Uri: https://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10.jar
         ChecksumType: SHA256
         Checksum: 36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a
-    - resource: xPSDesiredStateConfiguration/xRemoteFile
-      id: ucrt
-      directives:
-        description: download ucrts
-      settings:
-        DestinationPath: C:/Users/Public/Downloads
-        Uri: https://download.microsoft.com/download/C/5/D/C5D68AA1-F62E-422A-9084-4AD85CEB8D4D/WindowsUCRT.zip
-        ChecksumType: SHA256
-        Checksum: 3c9fff1e102adbab55e588ce58b4291db885a530b2ae3bcca851c2721c8be3e1
     - resource: xPSDesiredStateConfiguration/xMsiPackage
       id: JDK_x64
       directives:
diff --git a/.configurations/user_steps.dsc.yaml b/.configurations/user_steps.dsc.yaml
index 21646c12cc74..741ffcbbc050 100644
--- a/.configurations/user_steps.dsc.yaml
+++ b/.configurations/user_steps.dsc.yaml
@@ -18,7 +18,6 @@ properties:
         # the empty string element is so that each file can be specified with trailing comma
         TestScript: |
           $files = @(
-              "WindowsUCRT.zip",
               "apache-ant-1.10.15-bin.zip",
               "clang-format-5.0.0-win.exe",
               "jom_1_1_4.zip",
@@ -93,16 +92,6 @@ properties:
         TestScript: Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.15/bin/ant"
         GetScript:  Test-Path -Path "$env:USERPROFILE/lo/apache-ant-1.10.15/bin/ant"
         SetScript: Expand-Archive -LiteralPath "$env:PUBLIC/Downloads/apache-ant-1.10.15-bin.zip" -Destination "$env:USERPROFILE/lo/"
-    - resource: xPSDesiredStateConfiguration/xScript
-      id: ucrt-extract
-      dependsOn:
-        - lodir
-      directives:
-        description: extract ucrts to the ~/lo directory
-      settings:
-        TestScript: Test-Path -Path "$env:USERPROFILE/lo/ucrt/Windows8.1-KB2999226-x64.msu"
-        GetScript:  Test-Path -Path "$env:USERPROFILE/lo/ucrt/Windows8.1-KB2999226-x64.msu"
-        SetScript: Expand-Archive -LiteralPath "$env:PUBLIC/Downloads/WindowsUCRT.zip" -Destination "$env:USERPROFILE/lo/ucrt"
     - resource: xPSDesiredStateConfiguration/xScript
       id: spp-extract
       dependsOn:
@@ -172,7 +161,6 @@ properties:
           --with-ant-home=$env:USERPROFILE\lo\apache-ant-1.10.15
           --with-junit=$env:USERPROFILE\lo\junit-4.10.jar
           --with-doxygen=$env:USERPROFILE\lo\spp\c\bin\doxygen.exe
-          --with-ucrt-dir=$env:USERPROFILE\lo\ucrt
           #--enable-odk
           #--disable-dependency-tracking
           #--enable-dbgutil