Skip to content

Commit 255cb45

Browse files
authored
Rename sdk_v2/ to sdk/ and sdk/ to sdk_legacy/ (#532)
- Rename sdk_v2/ -> sdk/ (the current/active SDK) - Rename sdk/ -> sdk_legacy/ (the legacy SDK) - Update all cross-references in GitHub Actions workflows, docs, samples, and tests - Rename workflow from 'SDK V2 Build' to 'SDK Build' - Update path triggers from sdk_v2/** to sdk/**
1 parent 6cb2ae7 commit 255cb45

229 files changed

Lines changed: 4228 additions & 4228 deletions

File tree

Some content is hidden

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

.github/workflows/build-cs-steps.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ jobs:
4545
# /p:FoundryLocalCoreVersion="*-*" to always use nightly version of Foundry Local Core
4646
- name: Restore dependencies
4747
run: |
48-
# dotnet restore sdk_v2/cs/src/Microsoft.AI.Foundry.Local.csproj /p:UseWinML=${{ inputs.useWinML }} /p:FoundryLocalCoreVersion="*-*" --configfile sdk_v2/cs/NuGet.config
49-
dotnet restore sdk_v2/cs/src/Microsoft.AI.Foundry.Local.csproj /p:UseWinML=${{ inputs.useWinML }} --configfile sdk_v2/cs/NuGet.config
48+
# dotnet restore sdk/cs/src/Microsoft.AI.Foundry.Local.csproj /p:UseWinML=${{ inputs.useWinML }} /p:FoundryLocalCoreVersion="*-*" --configfile sdk/cs/NuGet.config
49+
dotnet restore sdk/cs/src/Microsoft.AI.Foundry.Local.csproj /p:UseWinML=${{ inputs.useWinML }} --configfile sdk/cs/NuGet.config
5050
5151
- name: Build solution
5252
run: |
53-
# dotnet build sdk_v2/cs/src/Microsoft.AI.Foundry.Local.csproj --no-restore --configuration ${{ inputs.buildConfiguration }} /p:UseWinML=${{ inputs.useWinML }} /p:FoundryLocalCoreVersion="*-*"
54-
dotnet build sdk_v2/cs/src/Microsoft.AI.Foundry.Local.csproj --no-restore --configuration ${{ inputs.buildConfiguration }} /p:UseWinML=${{ inputs.useWinML }}
53+
# dotnet build sdk/cs/src/Microsoft.AI.Foundry.Local.csproj --no-restore --configuration ${{ inputs.buildConfiguration }} /p:UseWinML=${{ inputs.useWinML }} /p:FoundryLocalCoreVersion="*-*"
54+
dotnet build sdk/cs/src/Microsoft.AI.Foundry.Local.csproj --no-restore --configuration ${{ inputs.buildConfiguration }} /p:UseWinML=${{ inputs.useWinML }}
5555
5656
# need to use direct git commands to clone from Azure DevOps instead of actions/checkout
5757
- name: Checkout test-data-shared from Azure DevOps
@@ -85,14 +85,14 @@ jobs:
8585
8686
- name: Run Foundry Local Core tests
8787
run: |
88-
# dotnet test sdk_v2/cs/test/FoundryLocal.Tests/Microsoft.AI.Foundry.Local.Tests.csproj --verbosity normal /p:UseWinML=${{ inputs.useWinML }} /p:FoundryLocalCoreVersion="*-*"
89-
dotnet test sdk_v2/cs/test/FoundryLocal.Tests/Microsoft.AI.Foundry.Local.Tests.csproj --verbosity normal /p:UseWinML=${{ inputs.useWinML }}
88+
# dotnet test sdk/cs/test/FoundryLocal.Tests/Microsoft.AI.Foundry.Local.Tests.csproj --verbosity normal /p:UseWinML=${{ inputs.useWinML }} /p:FoundryLocalCoreVersion="*-*"
89+
dotnet test sdk/cs/test/FoundryLocal.Tests/Microsoft.AI.Foundry.Local.Tests.csproj --verbosity normal /p:UseWinML=${{ inputs.useWinML }}
9090
9191
- name: Pack NuGet package
9292
shell: pwsh
9393
run: |
94-
$projectPath = "sdk_v2/cs/src/Microsoft.AI.Foundry.Local.csproj"
95-
$outputDir = "sdk_v2/cs/bin"
94+
$projectPath = "sdk/cs/src/Microsoft.AI.Foundry.Local.csproj"
95+
$outputDir = "sdk/cs/bin"
9696
$version = "${{ inputs.version }}"
9797
$config = "${{ inputs.buildConfiguration }}"
9898
$useWinML = "${{ inputs.useWinML }}"
@@ -128,11 +128,11 @@ jobs:
128128
with:
129129
name: cs-sdk-${{ inputs.platform }}${{ inputs.useWinML == true && '-winml' || '' }}
130130
path: |
131-
sdk_v2/cs/bin/*.nupkg
132-
sdk_v2/cs/bin/*.snupkg
131+
sdk/cs/bin/*.nupkg
132+
sdk/cs/bin/*.snupkg
133133
134134
- name: Upload flcore logs
135135
uses: actions/upload-artifact@v4
136136
with:
137137
name: cs-sdk-${{ inputs.platform }}${{ inputs.useWinML == true && '-winml' || '' }}-logs
138-
path: sdk_v2/cs/logs/**
138+
path: sdk/cs/logs/**

.github/workflows/build-js-steps.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,39 +87,39 @@ jobs:
8787
8888
- name: npm install (WinML)
8989
if: ${{ inputs.useWinML == true }}
90-
working-directory: sdk_v2/js
90+
working-directory: sdk/js
9191
run: npm install --winml
9292

9393
- name: npm install (Standard)
9494
if: ${{ inputs.useWinML == false }}
95-
working-directory: sdk_v2/js
95+
working-directory: sdk/js
9696
run: npm install
9797

9898
# Verify that installing new packages doesn't strip custom native binary folders
9999
- name: npm install openai (verify persistence)
100-
working-directory: sdk_v2/js
100+
working-directory: sdk/js
101101
run: npm install openai
102102

103103
- name: Set package version
104-
working-directory: sdk_v2/js
104+
working-directory: sdk/js
105105
run: npm version ${{ env.ProjectVersion }} --no-git-tag-version --allow-same-version
106106

107107
- name: Run tests
108-
working-directory: sdk_v2/js
108+
working-directory: sdk/js
109109
run: npm test
110110

111111
- name: Build package
112-
working-directory: sdk_v2/js
112+
working-directory: sdk/js
113113
run: npm run build
114114

115115
- name: Pack npm package
116-
working-directory: sdk_v2/js
116+
working-directory: sdk/js
117117
run: npm pack
118118

119119
- name: Rename WinML artifact
120120
if: ${{ inputs.useWinML == true }}
121121
shell: pwsh
122-
working-directory: sdk_v2/js
122+
working-directory: sdk/js
123123
run: |
124124
$tgz = Get-ChildItem *.tgz | Select-Object -First 1
125125
if ($tgz) {
@@ -132,10 +132,10 @@ jobs:
132132
uses: actions/upload-artifact@v4
133133
with:
134134
name: js-sdk-${{ inputs.platform }}${{ inputs.useWinML == true && '-winml' || '' }}
135-
path: sdk_v2/js/*.tgz
135+
path: sdk/js/*.tgz
136136

137137
- name: Upload flcore logs
138138
uses: actions/upload-artifact@v4
139139
with:
140140
name: js-sdk-${{ inputs.platform }}${{ inputs.useWinML == true && '-winml' || '' }}-logs
141-
path: sdk_v2/js/logs/**
141+
path: sdk/js/logs/**

.github/workflows/build-rust-steps.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
defaults:
2727
run:
28-
working-directory: sdk_v2/rust
28+
working-directory: sdk/rust
2929

3030
env:
3131
CARGO_FEATURES: ${{ inputs.useWinML && '--features winml' || '' }}
@@ -44,7 +44,7 @@ jobs:
4444
- name: Cache cargo dependencies
4545
uses: Swatinem/rust-cache@v2
4646
with:
47-
workspaces: sdk_v2/rust -> target
47+
workspaces: sdk/rust -> target
4848

4949
- name: Checkout test-data-shared from Azure DevOps
5050
if: ${{ inputs.run-integration-tests }}
@@ -102,11 +102,11 @@ jobs:
102102
uses: actions/upload-artifact@v4
103103
with:
104104
name: rust-sdk-${{ inputs.platform }}${{ inputs.useWinML == true && '-winml' || '' }}
105-
path: sdk_v2/rust/target/package/*.crate
105+
path: sdk/rust/target/package/*.crate
106106

107107
- name: Upload flcore logs
108108
uses: actions/upload-artifact@v4
109109
if: always()
110110
with:
111111
name: rust-sdk-${{ inputs.platform }}${{ inputs.useWinML == true && '-winml' || '' }}-logs
112-
path: sdk_v2/rust/logs/**
112+
path: sdk/rust/logs/**

.github/workflows/foundry-local-sdk-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
name: SDK V2 Build
1+
name: SDK Build
22

33
on:
44
pull_request:
55
paths:
6-
- 'sdk_v2/**'
6+
- 'sdk/**'
77
- '.github/workflows/**'
88
push:
99
paths:
10-
- 'sdk_v2/**'
10+
- 'sdk/**'
1111
- '.github/workflows/**'
1212
branches:
1313
- main

docs/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Documentation for Foundry Local can be found in the following resources:
44

55
- [Microsoft Learn](https://learn.microsoft.com/azure/foundry-local/): This is the official documentation for Foundry Local, providing comprehensive guides, tutorials, and reference materials to help you get started and make the most of Foundry Local.
66
- SDK Reference:
7-
- [C# SDK Reference](../sdk_v2/cs/README.md): This documentation provides detailed information about the C# SDK for Foundry Local, including API references, usage examples, and best practices for integrating Foundry Local into your applications.
8-
- [JavaScript SDK Reference](../sdk_v2/js/README.md): This documentation offers detailed information about the JavaScript SDK for Foundry Local, including API references, usage examples, and best practices for integrating Foundry Local into your web applications.
7+
- [C# SDK Reference](../sdk/cs/README.md): This documentation provides detailed information about the C# SDK for Foundry Local, including API references, usage examples, and best practices for integrating Foundry Local into your applications.
8+
- [JavaScript SDK Reference](../sdk/js/README.md): This documentation offers detailed information about the JavaScript SDK for Foundry Local, including API references, usage examples, and best practices for integrating Foundry Local into your web applications.
99
- [Foundry Local Lab](https://github.com/Microsoft-foundry/foundry-local-lab): This GitHub repository contains a lab designed to help you learn how to use Foundry Local effectively. It includes hands-on exercises, sample code, and step-by-step instructions to guide you through the process of setting up and using Foundry Local in various scenarios.
1010

1111
## Supported Capabilities

samples/rust/audio-transcription-example/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ edition = "2021"
55
description = "Audio transcription example using the Foundry Local Rust SDK"
66

77
[dependencies]
8-
foundry-local-sdk = { path = "../../../sdk_v2/rust" }
8+
foundry-local-sdk = { path = "../../../sdk/rust" }
99
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
1010
tokio-stream = "0.1"

samples/rust/audio-transcription-example/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This example demonstrates audio transcription (non-streaming and streaming) usin
55
The `foundry-local-sdk` dependency is referenced via a local path. No crates.io publish is required:
66

77
```toml
8-
foundry-local-sdk = { path = "../../../sdk_v2/rust" }
8+
foundry-local-sdk = { path = "../../../sdk/rust" }
99
```
1010

1111
Run the application with a path to a WAV file:
@@ -19,7 +19,7 @@ cargo run -- path/to/audio.wav
1919
To use the WinML backend, enable the `winml` feature in `Cargo.toml`:
2020

2121
```toml
22-
foundry-local-sdk = { path = "../../../sdk_v2/rust", features = ["winml"] }
22+
foundry-local-sdk = { path = "../../../sdk/rust", features = ["winml"] }
2323
```
2424

2525
No code changes are needed — same API, different backend.

samples/rust/foundry-local-webserver/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55
description = "Example of using the Foundry Local SDK with a local OpenAI-compatible web server"
66

77
[dependencies]
8-
foundry-local-sdk = { path = "../../../sdk_v2/rust" }
8+
foundry-local-sdk = { path = "../../../sdk/rust" }
99
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
1010
serde_json = "1"
1111
reqwest = { version = "0.12", features = ["json"] }

samples/rust/foundry-local-webserver/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This example demonstrates how to start a local OpenAI-compatible web server usin
55
The `foundry-local-sdk` dependency is referenced via a local path. No crates.io publish is required:
66

77
```toml
8-
foundry-local-sdk = { path = "../../../sdk_v2/rust" }
8+
foundry-local-sdk = { path = "../../../sdk/rust" }
99
```
1010

1111
Run the application:
@@ -19,7 +19,7 @@ cargo run
1919
To use the WinML backend, enable the `winml` feature in `Cargo.toml`:
2020

2121
```toml
22-
foundry-local-sdk = { path = "../../../sdk_v2/rust", features = ["winml"] }
22+
foundry-local-sdk = { path = "../../../sdk/rust", features = ["winml"] }
2323
```
2424

2525
No code changes are needed — same API, different backend.

samples/rust/native-chat-completions/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ edition = "2021"
55
description = "Native SDK chat completions (non-streaming and streaming) using the Foundry Local Rust SDK"
66

77
[dependencies]
8-
foundry-local-sdk = { path = "../../../sdk_v2/rust" }
8+
foundry-local-sdk = { path = "../../../sdk/rust" }
99
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
1010
tokio-stream = "0.1"

0 commit comments

Comments
 (0)