Skip to content

Commit 7c29566

Browse files
committed
Merge branch 'dev/saurabh/syncmain' into dev/saurabh/syncmain-v2
2 parents 17e3964 + f1f3ea8 commit 7c29566

93 files changed

Lines changed: 3498 additions & 3330 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.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2+
3+
pipelines:
4+
2236:
5+
retail:
6+
source:
7+
credscan:
8+
lastModifiedDate: 2026-02-26
9+
policheck:
10+
lastModifiedDate: 2026-02-26
11+
eslint:
12+
lastModifiedDate: 2026-02-26
13+
psscriptanalyzer:
14+
lastModifiedDate: 2026-02-26
15+
armory:
16+
lastModifiedDate: 2026-02-26
17+
binary:
18+
credscan:
19+
lastModifiedDate: 2026-02-26
20+
binskim:
21+
lastModifiedDate: 2026-02-26

.config/guardian/.gdnbaselines

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"properties": {
3+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4+
},
5+
"version": "1.0.0",
6+
"baselines": {
7+
"default": {
8+
"name": "default",
9+
"createdDate": "2026-02-26 00:52:39Z",
10+
"lastUpdatedDate": "2026-02-26 00:52:39Z"
11+
}
12+
},
13+
"results": {
14+
"bd1ce7227025d22a25d3d98df0aef3b236e0aa4987f80c43874a2afc3e3713a0": {
15+
"signature": "bd1ce7227025d22a25d3d98df0aef3b236e0aa4987f80c43874a2afc3e3713a0",
16+
"alternativeSignatures": [],
17+
"target": "mssql-py-core/tests/mssql_python/test_bulkcopy_access_token.py",
18+
"line": 443,
19+
"uriBaseId": "file:///D:/a/_work/1/s/",
20+
"memberOf": [
21+
"default"
22+
],
23+
"tool": "credscan",
24+
"ruleId": "CSCAN-GENERAL0030",
25+
"createdDate": "2026-02-26 00:52:39Z",
26+
"expirationDate": "2026-08-15 00:54:08Z",
27+
"justification": "This error is baselined with an expiration date of 180 days from 2026-02-26 00:54:08Z"
28+
}
29+
}
30+
}

.devcontainer/post-create.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ fnm use 20
1616
corepack enable
1717

1818
# Setup Python virtual environment for mssql-py-core development
19+
WORKSPACE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
1920
echo "Setting up Python virtual environment..."
20-
python3 -m venv /workspaces/mssql-tds/myvenv
21-
source /workspaces/mssql-tds/myvenv/bin/activate
21+
python3 -m venv "$WORKSPACE_DIR/myvenv"
22+
source "$WORKSPACE_DIR/myvenv/bin/activate"
2223

2324
# Install maturin (build tool) and dev dependencies from pyproject.toml
2425
pip install --upgrade pip
2526
pip install maturin
26-
pip install -e "/workspaces/mssql-tds/mssql-py-core[dev]"
27+
pip install -e "$WORKSPACE_DIR/mssql-py-core[dev]"
2728

28-
echo "Python venv ready at /workspaces/mssql-tds/myvenv"
29-
echo "Run 'source /workspaces/mssql-tds/myvenv/bin/activate' to activate"
29+
echo "Python venv ready at $WORKSPACE_DIR/myvenv"
30+
echo "Run 'source $WORKSPACE_DIR/myvenv/bin/activate' to activate"

.github/prompts/plan-documentMssqlTdsPublicApi.prompt.md

Lines changed: 342 additions & 0 deletions
Large diffs are not rendered by default.

.pipeline/scripts/containerized-build.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,12 @@ cd mssql-tds
3939
cargo nextest archive --archive-file tdslib-nextest.tar.zst
4040
mv tdslib-nextest.tar.zst /workspace/
4141
cd ..
42+
43+
# Verify fuzz targets compile (PR builds only)
44+
if [ "$IS_PR_BUILD" = "true" ]; then
45+
echo '==> Installing nightly toolchain for fuzz build check...'
46+
rustup toolchain install nightly --profile minimal
47+
echo '==> Checking fuzz targets compile...'
48+
RUSTFLAGS="--cfg fuzzing" cargo +nightly check --manifest-path mssql-tds/fuzz/Cargo.toml
49+
echo '==> Fuzz build check passed.'
50+
fi

.pipeline/validation-pipeline.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,11 @@ stages:
338338
osType: Linux
339339
fuzzDurationSeconds: 300
340340
fuzzTarget: fuzz_connection_provider_context
341+
- template: templates/fuzz-template.yml
342+
parameters:
343+
osType: Linux
344+
fuzzDurationSeconds: 300
345+
fuzzTarget: fuzz_bulk_copy
341346

342347
- stage: Build_mssql_python
343348
dependsOn: []

dev/build-fuzz.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
set -e
3+
4+
# Build all fuzz targets for mssql-tds.
5+
# Requires: nightly toolchain and cargo-fuzz.
6+
7+
if ! rustup toolchain list | grep -q "nightly"; then
8+
echo "Installing nightly toolchain..."
9+
rustup toolchain install nightly
10+
fi
11+
12+
if ! cargo +nightly fuzz --version &> /dev/null 2>&1; then
13+
echo "Installing cargo-fuzz..."
14+
cargo +nightly install cargo-fuzz
15+
fi
16+
17+
cd "$(dirname "$0")/../mssql-tds"
18+
cargo +nightly fuzz build

mssql-js/package.json

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
},
1818
"license": "MIT",
1919
"dependencies": {
20-
"@js-joda/core": "^5.6.5",
20+
"@js-joda/core": "^5.7.0",
2121
"iconv-lite": "^0.6.3"
2222
},
2323
"devDependencies": {
2424
"@napi-rs/cli": "^2.18.4",
25-
"@types/benchmark": "^2",
26-
"@types/node": "^24.0.14",
27-
"@typescript-eslint/eslint-plugin": "^8.37.0",
28-
"@typescript-eslint/parser": "^8.37.0",
29-
"ava": "^6.0.1",
25+
"@types/benchmark": "^2.1.5",
26+
"@types/node": "^24.12.0",
27+
"@typescript-eslint/eslint-plugin": "^8.57.0",
28+
"@typescript-eslint/parser": "^8.57.0",
29+
"ava": "^6.4.1",
3030
"benchmark": "^2.1.4",
31-
"eslint": "^9.31.0",
32-
"eslint-config-prettier": "^10.1.5",
33-
"eslint-plugin-prettier": "^5.5.1",
34-
"prettier": "^3.6.2",
31+
"eslint": "^9.39.4",
32+
"eslint-config-prettier": "^10.1.8",
33+
"eslint-plugin-prettier": "^5.5.5",
34+
"prettier": "^3.8.1",
3535
"tap-xunit": "^2.4.1",
36-
"typescript": "^5.8.3"
36+
"typescript": "^5.9.3"
3737
},
3838
"ava": {
3939
"timeout": "3m"
@@ -55,5 +55,8 @@
5555
"format:check": "prettier --check \"lib/**/*.ts\" \"__test__/**/*.{js,mjs,ts}\"",
5656
"lint": "eslint . --ext .ts,.js --max-warnings=0"
5757
},
58-
"packageManager": "yarn@4.9.2"
58+
"packageManager": "yarn@4.9.2",
59+
"resolutions": {
60+
"tar": "7.5.11"
61+
}
5962
}

0 commit comments

Comments
 (0)