Commit 57b7a0c

committed

fix: resolve merge conflicts with upstream main

- Adopt upstream's restructured welcome section (key benefits list, collapsible SDK examples) while preserving audio transcription additions - Merge Supported Tasks table, audio transcription code example, and enhanced samples table descriptions into upstream's new format - Add Foundry Local Lab link from upstream to docs/README.md alongside our capabilities table and samples links - Drop standalone Features section (key points already in welcome benefits)

2 parents 4e3ac78 + dcdf7a1 commit 57b7a0cCopy full SHA for 57b7a0c

48 files changed

.gitignore
README.md
docs
- README.md
samples
- cs/GettingStarted
  - Directory.Packages.props
  - ExcludeExtraLibs.props
  - cross-platform
    - AudioTranscriptionExample
      - AudioTranscriptionExample.csproj
    - FoundryLocalWebServer
      - FoundryLocalWebServer.csproj
    - FoundrySamplesXPlatform.sln
    - HelloFoundryLocalSdk
      - HelloFoundryLocalSdk.csproj
    - ModelManagementExample
      - ModelManagementExample.csproj
  - src/AudioTranscriptionExample
    - Program.cs
  - windows
    - AudioTranscriptionExample
      - AudioTranscriptionExample.csproj
    - FoundryLocalWebServer
      - FoundryLocalWebServer.csproj
    - FoundrySamplesWinML.sln
    - HelloFoundryLocalSdk
      - HelloFoundryLocalSdk.csproj
    - ModelManagementExample
      - ModelManagementExample.csproj
- electron/foundry-chat
  - .gitignore
  - .vscode
    - launch.json
  - Readme.md
  - chat.html
  - main.js
  - package.json
  - preload.cjs
- js
  - audio-transcription-example
  - copilot-sdk-foundry-local
    - README.md
    - src
      - app.ts
      - tool-calling.ts
  - electron-chat-application
  - hello-foundry-local
    - README.md
    - package.json
    - src
      - app.js
  - langchain-integration-example
    - README.md
    - app.js
  - native-chat-completions
    - README.md
    - app.js
  - web-server-example
    - README.md
    - app.js

`‎.gitignore‎`

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 test.ipynb
 -.DS_Store
 +.DS_STORE
 # Visual Studio and Visual Studio Code
 bin/

Comments

(0)