Remove Win7 from YAML

microsoft · Dec 6, 2024 · 825850a · 825850a
1 parent 9a2bc11
commit 825850a
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 299 deletions.
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -46,16 +46,6 @@ jobs:
       working-directory: ${{ github.workspace }}
       run: msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Desktop_${{ matrix.vs }}_Win10.sln
 
-    - if: matrix.platform != 'ARM64'
-      name: Restore NuGet packages
-      working-directory: ${{ github.workspace }}
-      run: nuget restore ./DirectXTK_Desktop_${{ matrix.vs }}_Win7.sln
-
-    - if: matrix.platform != 'ARM64'
-      name: 'Build (Windows 7)'
-      working-directory: ${{ github.workspace }}
-      run: msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Desktop_${{ matrix.vs }}_Win7.sln
-
     - if: matrix.vs == '2022'
       name: 'Build (UWP)'
       working-directory: ${{ github.workspace }}

diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml
@@ -102,7 +102,7 @@ jobs:
     - name: 'Configure CMake'
       working-directory: ${{ github.workspace }}
       run: >
-        cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=OFF -DBUILD_XAUDIO_WIN10=OFF -DBUILD_XAUDIO_WIN8=OFF -DBUILD_XAUDIO_WIN7=ON
+        cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=OFF -DBUILD_XAUDIO_WIN10=OFF -DBUILD_XAUDIO_WIN8=OFF -DBUILD_XAUDIO_REDIST=ON
         -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
         -DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}"
 

diff --git a/Audio/packages.config b/Audio/packages.config
diff --git a/build/DirectXTK-GitHub-Dev17.yml b/build/DirectXTK-GitHub-Dev17.yml
@@ -47,16 +47,6 @@ jobs:
   - checkout: self
     clean: true
     fetchTags: false
-  - task: NuGetToolInstaller@1
-    displayName: 'Use NuGet'
-  - task: NuGetAuthenticate@1
-    displayName: 'NuGet Auth'
-  - task: NuGetCommand@2
-    displayName: NuGet restore
-    inputs:
-      solution: DirectXTK_Desktop_2022_Win7.sln
-      feedRestore: $(GUID_FEED)
-      includeNuGetOrg: false
   - task: VSBuild@1
     displayName: Build solution DirectXTK_Desktop_2022.sln 32dbg
     inputs:
@@ -89,38 +79,6 @@ jobs:
       platform: x64
       configuration: Release
       msbuildArchitecture: x64
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022_Win7.sln 32dbg
-    inputs:
-      solution: DirectXTK_Desktop_2022_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x86
-      configuration: Debug
-      msbuildArchitecture: x64
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022_Win7.sln 32rel
-    inputs:
-      solution: DirectXTK_Desktop_2022_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x86
-      configuration: Release
-      msbuildArchitecture: x64
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022_Win7.sln 64dbg
-    inputs:
-      solution: DirectXTK_Desktop_2022_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x64
-      configuration: Debug
-      msbuildArchitecture: x64
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022_Win7.sln 64rel
-    inputs:
-      solution: DirectXTK_Desktop_2022_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x64
-      configuration: Release
-      msbuildArchitecture: x64
   - task: CmdLine@2
     displayName: 'Reclaim diskspace'
     inputs:

diff --git a/build/DirectXTK-GitHub-MinGW.yml b/build/DirectXTK-GitHub-MinGW.yml
@@ -154,7 +154,7 @@ jobs:
     inputs:
       cwd: $(Build.SourcesDirectory)
       cmakeArgs: >
-        -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86 -DBUILD_XAUDIO_WIN7=ON
+        -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86 -DBUILD_XAUDIO_REDIST=ON
         -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
         -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
         -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
@@ -231,7 +231,7 @@ jobs:
     inputs:
       cwd: $(Build.SourcesDirectory)
       cmakeArgs: >
-        -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64 -DBUILD_XAUDIO_WIN7=ON
+        -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64 -DBUILD_XAUDIO_REDIST=ON
         -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
         -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
         -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static

diff --git a/build/DirectXTK-GitHub-SDK-prerelease.yml b/build/DirectXTK-GitHub-SDK-prerelease.yml
@@ -91,12 +91,6 @@ jobs:
       SourceFolder: build
       Contents: 'Directory.Build.props'
       TargetFolder: $(Build.SourcesDirectory)
-  - task: NuGetCommand@2
-    displayName: NuGet restore
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      selectOrConfig: config
-      nugetConfigPath: NuGet.Config
   - task: VSBuild@1
     displayName: Build solution DirectXTK_Desktop_2019.sln 32dbg
     inputs:
@@ -125,34 +119,6 @@ jobs:
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x64
       configuration: Release
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 32dbg
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x86
-      configuration: Debug
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 32rel
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x86
-      configuration: Release
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2019.sln 64dbg
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x64
-      configuration: Debug
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 64rel
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x64
-      configuration: Release
   - task: CmdLine@2
     displayName: 'Reclaim diskspace'
     inputs:

diff --git a/build/DirectXTK-GitHub-SDK-release.yml b/build/DirectXTK-GitHub-SDK-release.yml
@@ -91,12 +91,6 @@ jobs:
       SourceFolder: build
       Contents: 'Directory.Build.props'
       TargetFolder: $(Build.SourcesDirectory)
-  - task: NuGetCommand@2
-    displayName: NuGet restore
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      selectOrConfig: config
-      nugetConfigPath: NuGet.Config
   - task: VSBuild@1
     displayName: Build solution DirectXTK_Desktop_2019.sln 32dbg
     inputs:
@@ -125,34 +119,6 @@ jobs:
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x64
       configuration: Release
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 32dbg
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x86
-      configuration: Debug
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 32rel
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x86
-      configuration: Release
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2019.sln 64dbg
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x64
-      configuration: Debug
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 64rel
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x64
-      configuration: Release
   - task: CmdLine@2
     displayName: 'Reclaim diskspace'
     inputs:

diff --git a/build/DirectXTK-GitHub-Test-Dev17.yml b/build/DirectXTK-GitHub-Test-Dev17.yml
@@ -160,76 +160,6 @@ jobs:
       configuration: Release
       msbuildArchitecture: x64
 
-- job: DESKTOP_BUILD_WIN7
-  displayName: 'Win32 Desktop for Windows 7'
-  timeoutInMinutes: 60
-  workspace:
-    clean: all
-  steps:
-  - checkout: self
-    clean: true
-    fetchTags: false
-    fetchDepth: 1
-    path: 's'
-  - checkout: testRepo
-    displayName: Fetch Tests
-    clean: true
-    fetchTags: false
-    fetchDepth: 1
-    path: 's/Tests'
-  - task: NuGetToolInstaller@1
-    displayName: 'Use NuGet'
-  - task: NuGetAuthenticate@1
-    displayName: 'NuGet Auth'
-  - task: NuGetCommand@2
-    displayName: NuGet restore
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      feedRestore: $(GUID_FEED)
-      includeNuGetOrg: false
-  - task: NuGetCommand@2
-    displayName: NuGet restore tests
-    inputs:
-      solution: Tests\DirectXTK_Tests_Desktop_2019_Win7.sln
-      feedRestore: $(GUID_FEED)
-      includeNuGetOrg: false
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Tests_Desktop_2022_Win7.sln 32dbg
-    inputs:
-      solution: Tests/DirectXTK_Tests_Desktop_2022_Win7.sln
-      vsVersion: 17.0
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x86
-      configuration: Debug
-      msbuildArchitecture: x64
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Tests_Desktop_2022_Win7.sln 32rel
-    inputs:
-      solution: Tests/DirectXTK_Tests_Desktop_2022_Win7.sln
-      vsVersion: 17.0
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x86
-      configuration: Release
-      msbuildArchitecture: x64
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Tests_Desktop_2022_Win7.sln 64rel
-    inputs:
-      solution: Tests/DirectXTK_Tests_Desktop_2022_Win7.sln
-      vsVersion: 17.0
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x64
-      configuration: Release
-      msbuildArchitecture: x64
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Tests_Desktop_2022_Win7.sln 64dbg
-    inputs:
-      solution: Tests/DirectXTK_Tests_Desktop_2022_Win7.sln
-      vsVersion: 17.0
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x64
-      configuration: Debug
-      msbuildArchitecture: x64
-
 - job: CMAKE_BUILD_X64
   displayName: 'CMake for X64 BUILD_TESTING=ON'
   timeoutInMinutes: 60

diff --git a/build/DirectXTK-GitHub-Test.yml b/build/DirectXTK-GitHub-Test.yml
@@ -148,70 +148,6 @@ jobs:
       platform: ARM64
       configuration: Release
 
-- job: DESKTOP_BUILD_WIN7
-  displayName: 'Win32 Desktop for Windows 7'
-  timeoutInMinutes: 120
-  steps:
-  - checkout: self
-    clean: true
-    fetchTags: false
-    fetchDepth: 1
-    path: 's'
-  - checkout: testRepo
-    displayName: Fetch Tests
-    clean: true
-    fetchTags: false
-    fetchDepth: 1
-    path: 's/Tests'
-  - task: NuGetToolInstaller@1
-    displayName: 'Use NuGet'
-  - task: NuGetAuthenticate@1
-    displayName: 'NuGet Auth'
-  - task: NuGetCommand@2
-    displayName: NuGet restore
-    inputs:
-      solution: DirectXTK_Desktop_2019_Win7.sln
-      feedRestore: $(GUID_FEED)
-      includeNuGetOrg: false
-  - task: NuGetCommand@2
-    displayName: NuGet restore tests
-    inputs:
-      solution: Tests\DirectXTK_Tests_Desktop_2019_Win7.sln
-      feedRestore: $(GUID_FEED)
-      includeNuGetOrg: false
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Tests_Desktop_2019_Win7.sln 32dbg
-    inputs:
-      solution: Tests/DirectXTK_Tests_Desktop_2019_Win7.sln
-      vsVersion: 16.0
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x86
-      configuration: Debug
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Tests_Desktop_2019_Win7.sln 32rel
-    inputs:
-      solution: Tests/DirectXTK_Tests_Desktop_2019_Win7.sln
-      vsVersion: 16.0
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x86
-      configuration: Release
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Tests_Desktop_2019_Win7.sln 64rel
-    inputs:
-      solution: Tests/DirectXTK_Tests_Desktop_2019_Win7.sln
-      vsVersion: 16.0
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x64
-      configuration: Release
-  - task: VSBuild@1
-    displayName: Build solution DirectXTK_Tests_Desktop_2019_Win7.sln 64dbg
-    inputs:
-      solution: Tests/DirectXTK_Tests_Desktop_2019_Win7.sln
-      vsVersion: 16.0
-      msbuildArgs: /p:PreferredToolArchitecture=x64
-      platform: x64
-      configuration: Debug
-
 - job: UWP_BUILD_X64
   displayName: 'Universal Windows Platform (UWP) for x64'
   timeoutInMinutes: 120