Skip to content

Commit 1aa8077

Browse files
yeelam-gordonyeelam-gordon
committed
Resolve conflict
2 parents 38427a6 + cf85381 commit 1aa8077

File tree

435 files changed

+15172
-7231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

435 files changed

+15172
-7231
lines changed

‎.github/copilot-instructions.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,24 @@ Read scripts first; improve their headers instead of duplicating detail here.
66
Use only `build.ps1` / `build.cmd`. Read `build.ps1` before invoking. It auto: detects platform, picks solutions (current dir > selected sample > all), initializes VS DevShell, restores via local nuget, emits `.binlog` per solution. Do NOT hand-roll msbuild/nuget restore logic.
77

88
## Versions
9-
Run `UpdateVersions.ps1` only after reading it. Get the WinAppSDK version string from: https://www.nuget.org/packages/Microsoft.WindowsAppSdk/ (stable/preview/servicing) and pass as `-WinAppSDKVersion`. If script params unclear, fix that script.
9+
Run `UpdateVersions.ps1` only after reading it. Get the WinAppSDK version string from: https://www.nuget.org/packages/Microsoft.WindowsAppSdk/ (stable/preview/servicing) and pass as `-WinAppSDKVersion`.
1010

1111
## Coding Guidelines
1212
- Small, focused diffs; no mass reformatting; ensure SOLID principles.
1313
- Preserve APIs, encoding, line endings, relative paths.
14-
- Support arm64 & x64 paths.
1514
- PowerShell: approved verbs; each new script has Synopsis/Description/Parameters/Examples header.
1615
- C#/C++: follow existing style; lean headers; forward declare where practical; keep samples illustrative.
1716
- Minimal necessary comments; avoid noise. Centralize user strings for localization.
1817
- Never log secrets or absolute external paths.
1918

19+
## Language style rules
20+
- Always enforce repo analyzers: root `.editorconfig` plus any `stylecop.json`.
21+
- C# code follows StyleCop.Analyzers and Microsoft.CodeAnalysis.NetAnalyzers.
22+
- C++ code honors `.clang-format` plus `.clang-tidy` (modernize/cppcoreguidelines/readability).
23+
- Markdown files wrap at 80 characters and use ATX headers with fenced code blocks that include language tags.
24+
- YAML files indent two spaces and add comments for complex settings while keeping keys clear.
25+
- PowerShell scripts use Verb-Noun names and prefer single-quoted literals while documenting parameters and satisfying PSScriptAnalyzer.
26+
2027
## PR Guidance
2128
- One intent per PR. Update script README/header if behavior changes.
2229
- Provide summary: what / why / validation.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ bld/
3131
[Ll]og/
3232
[Ll]ogs/
3333

34+
# Downloaded model files (these will be downloaded during build)
35+
Samples/WindowsML/Resources/obj/
36+
3437
# Visual Studio 2015/2017 cache/options directory
3538
.vs/
3639
# Uncomment if you have tasks that create the project's static files in wwwroot

‎DynamicDependenciesSample/DynamicDependencies/DirectX/D3D9ExSample.vcxproj‎

Lines changed: 49 additions & 48 deletions
Large diffs are not rendered by default.

‎DynamicDependenciesSample/DynamicDependencies/DirectX/packages.config‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
4-
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.3233" targetFramework="native" />
5-
<package id="Microsoft.WindowsAppSDK" version="1.8.250702007-experimental4" targetFramework="native" />
6-
<package id="Microsoft.WindowsAppSDK.Base" version="1.8.250509001-experimental" targetFramework="native" />
7-
<package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25052801-experimental3" targetFramework="native" />
8-
<package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250701000-experimental" targetFramework="native" />
9-
<package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250626001-experimental" targetFramework="native" />
10-
<package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250702007-experimental4" targetFramework="native" />
11-
<package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250701000-experimental" targetFramework="native" />
12-
<package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250610001-experimental" targetFramework="native" />
13-
<package id="Microsoft.WindowsAppSDK.AI" version="1.8.407-experimental" targetFramework="native" />
14-
<package id="Microsoft.WindowsAppSDK.ML" version="1.8.126-experimental" targetFramework="native" />
15-
<package id="Microsoft.Windows.SDK.BuildTools.MSIX" version="1.7.20250508.1" targetFramework="native" />
4+
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.4654" targetFramework="native" />
5+
<package id="Microsoft.WindowsAppSDK" version="1.8.250916003" targetFramework="native" />
6+
<package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
7+
<package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
8+
<package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
9+
<package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
10+
<package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250916003" targetFramework="native" />
11+
<package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
12+
<package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250904007" targetFramework="native" />
13+
<package id="Microsoft.WindowsAppSDK.AI" version="1.8.38" targetFramework="native" />
14+
<package id="Microsoft.WindowsAppSDK.ML" version="1.8.2091" targetFramework="native" />
15+
<package id="Microsoft.Windows.SDK.BuildTools.MSIX" version="1.7.20250829.1" targetFramework="native" />
1616
<package id="Microsoft.Web.WebView2" version="1.0.3179.45" targetFramework="native" />
1717
</packages>
1818

19+

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ This repository hosts samples for the [Windows App SDK](https://github.com/micro
99
## 💻 List of samples
1010

1111
### Artificial Intelligence
12-
- [Windows AI sample](Samples/WindowsAIFoundry/cs-winui/) : These samples demonstrate how to use the [Windows AI apis](https://learn.microsoft.com/windows/ai/apis/), like Phi Silica, Text Extraction (OCR) and Imaging APIs.
13-
12+
13+
- [Windows AI sample](Samples/WindowsAIFoundry/cs-winui/): These samples demonstrate how to use the [Windows AI APIs](https://learn.microsoft.com/windows/ai/apis/), like Phi Silica, Text Extraction (OCR) and Imaging APIs.
14+
15+
- [Windows ML](Samples/WindowsML): These samples demonstrate running hardware-accelerated ONNX models (CPU, GPU, or NPU when available) on Windows using C++, C#, and Python. See the [Windows ML overview](https://learn.microsoft.com/windows/ai/new-windows-ml/overview).
16+
1417
- [AI Dev Gallery](https://github.com/microsoft/ai-dev-gallery): The AI Dev Gallery is a collection of open-source samples showcasing how to integrate on-device AI capabilities into Windows apps using Windows Copilot Runtime and open-source models using ONNX.
1518

1619
### App Lifecycle and System Services

0 commit comments

Comments
 (0)