diff options
| author | v-junyli <[email protected]> | 2025-04-01 18:06:03 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-04-01 18:06:03 -0700 |
| commit | 89cb2a985612eb83e20b15f6445228ee7f681fba (patch) | |
| tree | 252d443a3a38dad0ecb9db09ce2490fb88f07f5f | |
| parent | ee60abcd73e358f0a3f25cb5101f981e04a99168 (diff) | |
| parent | f9c0f622921ad00da0b9f0e081ec24887ed4488e (diff) | |
Merge pull request #1284 from microsoft/main
merge from main to develop 2502D
| -rw-r--r-- | .github/workflows/ci-pr.yml | 2 | ||||
| -rw-r--r-- | Directory.Build.props | 10 | ||||
| -rw-r--r-- | packages.config | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 9c1202b2..0e5825d1 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -27,7 +27,7 @@ jobs: - name: Get changed files id: get-changed-files - uses: tj-actions/changed-files@v41 + uses: tj-actions/changed-files@v46 with: separator: "," diff --git a/Directory.Build.props b/Directory.Build.props index 4f46faef..dfdef8b5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ <Project> -<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26100.2454\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26100.2454\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/> -<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26100.2454\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26100.2454\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/> -<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.2454\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.2454\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/> -<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.2454\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.2454\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/> -<Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26100.2454\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26100.2454\build\native\Microsoft.Windows.SDK.cpp.props')"/> +<Import Project="packages\Microsoft.Windows.WDK.x64.10.0.26100.3323\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('packages\Microsoft.Windows.WDK.x64.10.0.26100.3323\build\native\Microsoft.Windows.WDK.x64.props') and '$(Platform)' == 'x64'"/> +<Import Project="packages\Microsoft.Windows.WDK.arm64.10.0.26100.3323\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('packages\Microsoft.Windows.WDK.arm64.10.0.26100.3323\build\native\Microsoft.Windows.WDK.arm64.props') and '$(Platform)' == 'ARM64'"/> +<Import Project="packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.x64.props') and '$(Platform)' == 'x64'"/> +<Import Project="packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.arm64.props') and '$(Platform)' == 'ARM64'"/> +<Import Project="packages\Microsoft.Windows.SDK.CPP.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('packages\Microsoft.Windows.SDK.CPP.10.0.26100.3323\build\native\Microsoft.Windows.SDK.cpp.props')"/> </Project> diff --git a/packages.config b/packages.config index 51860634..fa8c2142 100644 --- a/packages.config +++ b/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.2454" targetFramework="native" /> - <package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.2454" targetFramework="native" /> - <package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.2454" targetFramework="native" /> - <package id="Microsoft.Windows.WDK.x64" version="10.0.26100.2454" targetFramework="native" /> - <package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.2454" targetFramework="native" /> + <package id="Microsoft.Windows.SDK.CPP" version="10.0.26100.3323" targetFramework="native" /> + <package id="Microsoft.Windows.SDK.CPP.x64" version="10.0.26100.3323" targetFramework="native" /> + <package id="Microsoft.Windows.SDK.CPP.arm64" version="10.0.26100.3323" targetFramework="native" /> + <package id="Microsoft.Windows.WDK.x64" version="10.0.26100.3323" targetFramework="native" /> + <package id="Microsoft.Windows.WDK.arm64" version="10.0.26100.3323" targetFramework="native" /> </packages> |