diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 79a4e4cc8..12bdf560d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,7 +21,7 @@ jobs: name: Validation steps: - name: Checkout source - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Validate Microsoft Git version shell: pwsh @@ -44,12 +44,12 @@ jobs: steps: - name: Checkout source - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: path: src - name: Install .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: 8.0.413 @@ -105,13 +105,13 @@ jobs: steps: - name: Download installers - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: Installers_${{ matrix.configuration }} path: install - name: Download functional tests drop - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: FunctionalTests_${{ matrix.configuration }} path: ft diff --git a/Directory.Build.props b/Directory.Build.props index 61e42400d..76c51bce4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -34,6 +34,15 @@ $(ProjectOutPath)bin\$(Platform)\$(Configuration)\ $(ProjectOutPath)intermediate\$(Platform)\$(Configuration)\ $(IntDir)include\ + + 10.0.16299.0 diff --git a/scripts/Build.bat b/scripts/Build.bat index cf8ebefd1..e51c8ebe8 100644 --- a/scripts/Build.bat +++ b/scripts/Build.bat @@ -46,12 +46,6 @@ SET VSWHERE_VER=2.6.7 "%NUGET_EXEC%" install vswhere -Version %VSWHERE_VER% -OutputDirectory %VFS_PACKAGESDIR% || exit /b 1 SET VSWHERE_EXEC="%VFS_PACKAGESDIR%\vswhere.%VSWHERE_VER%\tools\vswhere.exe" -REM Assumes default installation location for Windows 10 SDKs -IF NOT EXIST "C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0" ( - ECHO ERROR: Could not find Windows 10 SDK Version 16299 - EXIT /B 1 -) - REM Use vswhere to find the latest VS installation with the MSBuild component REM See https://github.com/Microsoft/vswhere/wiki/Find-MSBuild FOR /F "tokens=* USEBACKQ" %%F IN (`%VSWHERE_EXEC% -all -prerelease -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\amd64\MSBuild.exe`) DO (