Skip to content

Commit e5e5b70

Browse files
erikdarlingdataerikdarlingdata
committed
Merge branch 'dev' into feature/multi-query-stores-overview
Resolves conflicts after dev's CRLF->LF normalization (erikdarlingdata#307) and the QueryStoreGridControl GroupBy default change (erikdarlingdata#305, erikdarlingdata#306). The only real conflict was leftover blank lines in QueryStoreGridControl.axaml.cs where erikdarlingdata#306 collapsed whitespace after removing ExpandRowRecursive.
2 parents 353acdb + 512ede4 commit e5e5b70

119 files changed

Lines changed: 36998 additions & 36976 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.

‎.gitattributes‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Auto-detect text files and normalize line endings to LF in the repo.
2+
# Working-tree EOLs are decided per-pattern below.
3+
* text=auto
4+
5+
# Source and config — normalize to LF in repo, check out as-is on each platform
6+
*.cs text eol=lf
7+
*.csproj text eol=lf
8+
*.sln text eol=lf -crlf
9+
*.props text eol=lf
10+
*.targets text eol=lf
11+
*.json text eol=lf
12+
*.xml text eol=lf
13+
*.config text eol=lf
14+
*.md text eol=lf
15+
*.yml text eol=lf
16+
*.yaml text eol=lf
17+
*.editorconfig text eol=lf
18+
*.gitattributes text eol=lf
19+
*.gitignore text eol=lf
20+
21+
# Shell scripts must stay LF
22+
*.sh text eol=lf
23+
24+
# Windows-only scripts must stay CRLF
25+
*.ps1 text eol=crlf
26+
*.psm1 text eol=crlf
27+
*.psd1 text eol=crlf
28+
*.cmd text eol=crlf
29+
*.bat text eol=crlf
30+
31+
# Web assets
32+
*.js text eol=lf
33+
*.ts text eol=lf
34+
*.css text eol=lf
35+
*.html text eol=lf
36+
*.razor text eol=lf
37+
*.cshtml text eol=lf
38+
39+
# Binary assets — never touch
40+
*.png binary
41+
*.jpg binary
42+
*.jpeg binary
43+
*.gif binary
44+
*.ico binary
45+
*.pdf binary
46+
*.zip binary
47+
*.dll binary
48+
*.exe binary
49+
*.snk binary

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 89 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,89 @@
1-
name: Bug Report
2-
description: Report a problem with SQL Performance Studio
3-
title: "[BUG] "
4-
labels: ["bug"]
5-
6-
body:
7-
- type: dropdown
8-
id: component
9-
attributes:
10-
label: Component
11-
description: Which part of SQL Performance Studio is affected?
12-
options:
13-
- Desktop App (Windows)
14-
- Desktop App (macOS)
15-
- Desktop App (Linux)
16-
- CLI Tool
17-
- SSMS Extension
18-
validations:
19-
required: true
20-
21-
- type: input
22-
id: version
23-
attributes:
24-
label: SQL Performance Studio Version
25-
description: Check the About dialog or the release you downloaded.
26-
placeholder: "e.g., 0.7.0"
27-
validations:
28-
required: true
29-
30-
- type: input
31-
id: os-version
32-
attributes:
33-
label: Operating System
34-
description: The OS where you're running the app.
35-
placeholder: "e.g., Windows 11 23H2, macOS 15.3, Ubuntu 24.04"
36-
validations:
37-
required: true
38-
39-
- type: textarea
40-
id: description
41-
attributes:
42-
label: Describe the Bug
43-
description: A clear description of what the bug is.
44-
validations:
45-
required: true
46-
47-
- type: textarea
48-
id: steps
49-
attributes:
50-
label: Steps to Reproduce
51-
description: How can we reproduce this?
52-
placeholder: |
53-
1. Open a .sqlplan file
54-
2. Click on...
55-
3. See error
56-
validations:
57-
required: true
58-
59-
- type: textarea
60-
id: expected
61-
attributes:
62-
label: Expected Behavior
63-
description: What you expected to happen.
64-
validations:
65-
required: true
66-
67-
- type: textarea
68-
id: actual
69-
attributes:
70-
label: Actual Behavior
71-
description: What actually happened.
72-
validations:
73-
required: true
74-
75-
- type: textarea
76-
id: plan-file
77-
attributes:
78-
label: Plan File
79-
description: If applicable, attach or paste the .sqlplan file that triggers the issue. You can redact sensitive table/column names.
80-
validations:
81-
required: false
82-
83-
- type: textarea
84-
id: screenshots
85-
attributes:
86-
label: Screenshots
87-
description: If applicable, add screenshots to help explain the problem.
88-
validations:
89-
required: false
1+
name: Bug Report
2+
description: Report a problem with SQL Performance Studio
3+
title: "[BUG] "
4+
labels: ["bug"]
5+
6+
body:
7+
- type: dropdown
8+
id: component
9+
attributes:
10+
label: Component
11+
description: Which part of SQL Performance Studio is affected?
12+
options:
13+
- Desktop App (Windows)
14+
- Desktop App (macOS)
15+
- Desktop App (Linux)
16+
- CLI Tool
17+
- SSMS Extension
18+
validations:
19+
required: true
20+
21+
- type: input
22+
id: version
23+
attributes:
24+
label: SQL Performance Studio Version
25+
description: Check the About dialog or the release you downloaded.
26+
placeholder: "e.g., 0.7.0"
27+
validations:
28+
required: true
29+
30+
- type: input
31+
id: os-version
32+
attributes:
33+
label: Operating System
34+
description: The OS where you're running the app.
35+
placeholder: "e.g., Windows 11 23H2, macOS 15.3, Ubuntu 24.04"
36+
validations:
37+
required: true
38+
39+
- type: textarea
40+
id: description
41+
attributes:
42+
label: Describe the Bug
43+
description: A clear description of what the bug is.
44+
validations:
45+
required: true
46+
47+
- type: textarea
48+
id: steps
49+
attributes:
50+
label: Steps to Reproduce
51+
description: How can we reproduce this?
52+
placeholder: |
53+
1. Open a .sqlplan file
54+
2. Click on...
55+
3. See error
56+
validations:
57+
required: true
58+
59+
- type: textarea
60+
id: expected
61+
attributes:
62+
label: Expected Behavior
63+
description: What you expected to happen.
64+
validations:
65+
required: true
66+
67+
- type: textarea
68+
id: actual
69+
attributes:
70+
label: Actual Behavior
71+
description: What actually happened.
72+
validations:
73+
required: true
74+
75+
- type: textarea
76+
id: plan-file
77+
attributes:
78+
label: Plan File
79+
description: If applicable, attach or paste the .sqlplan file that triggers the issue. You can redact sensitive table/column names.
80+
validations:
81+
required: false
82+
83+
- type: textarea
84+
id: screenshots
85+
attributes:
86+
label: Screenshots
87+
description: If applicable, add screenshots to help explain the problem.
88+
validations:
89+
required: false

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
blank_issues_enabled: false
2-
contact_links:
3-
- name: Questions & Discussion
4-
url: https://github.com/erikdarlingdata/PerformanceStudio/discussions
5-
about: Ask questions and discuss SQL Performance Studio with the community
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Questions & Discussion
4+
url: https://github.com/erikdarlingdata/PerformanceStudio/discussions
5+
about: Ask questions and discuss SQL Performance Studio with the community

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
name: Feature Request
2-
description: Suggest a new feature or enhancement
3-
title: "[FEATURE] "
4-
labels: ["enhancement"]
5-
6-
body:
7-
- type: checkboxes
8-
id: component
9-
attributes:
10-
label: Which component(s) does this affect?
11-
options:
12-
- label: Desktop App
13-
- label: CLI Tool
14-
- label: SSMS Extension
15-
- label: Plan Analysis Rules
16-
- label: Documentation
17-
validations:
18-
required: true
19-
20-
- type: textarea
21-
id: problem
22-
attributes:
23-
label: Problem Statement
24-
description: Describe the problem you're trying to solve or the limitation you're facing.
25-
validations:
26-
required: true
27-
28-
- type: textarea
29-
id: solution
30-
attributes:
31-
label: Proposed Solution
32-
description: Describe your proposed feature or enhancement.
33-
validations:
34-
required: true
35-
36-
- type: textarea
37-
id: use-case
38-
attributes:
39-
label: Use Case
40-
description: How would you use this feature? Provide a specific example.
41-
validations:
42-
required: true
43-
44-
- type: textarea
45-
id: alternatives
46-
attributes:
47-
label: Alternatives Considered
48-
description: Have you considered any alternative solutions or workarounds?
49-
validations:
50-
required: false
1+
name: Feature Request
2+
description: Suggest a new feature or enhancement
3+
title: "[FEATURE] "
4+
labels: ["enhancement"]
5+
6+
body:
7+
- type: checkboxes
8+
id: component
9+
attributes:
10+
label: Which component(s) does this affect?
11+
options:
12+
- label: Desktop App
13+
- label: CLI Tool
14+
- label: SSMS Extension
15+
- label: Plan Analysis Rules
16+
- label: Documentation
17+
validations:
18+
required: true
19+
20+
- type: textarea
21+
id: problem
22+
attributes:
23+
label: Problem Statement
24+
description: Describe the problem you're trying to solve or the limitation you're facing.
25+
validations:
26+
required: true
27+
28+
- type: textarea
29+
id: solution
30+
attributes:
31+
label: Proposed Solution
32+
description: Describe your proposed feature or enhancement.
33+
validations:
34+
required: true
35+
36+
- type: textarea
37+
id: use-case
38+
attributes:
39+
label: Use Case
40+
description: How would you use this feature? Provide a specific example.
41+
validations:
42+
required: true
43+
44+
- type: textarea
45+
id: alternatives
46+
attributes:
47+
label: Alternatives Considered
48+
description: Have you considered any alternative solutions or workarounds?
49+
validations:
50+
required: false

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
## What does this PR do?
2-
3-
A clear description of the change and why it's being made.
4-
5-
## Which component(s) does this affect?
6-
7-
- [ ] Desktop App (PlanViewer.App)
8-
- [ ] Core Library (PlanViewer.Core)
9-
- [ ] CLI Tool (PlanViewer.Cli)
10-
- [ ] SSMS Extension (PlanViewer.Ssms)
11-
- [ ] Tests
12-
- [ ] Documentation
13-
14-
## How was this tested?
15-
16-
Describe the testing you've done. Include:
17-
- Plan files tested (estimated, actual, Query Store, etc.)
18-
- Platforms tested (Windows, macOS, Linux)
19-
20-
## Checklist
21-
22-
- [ ] I have read the [contributing guide](https://github.com/erikdarlingdata/PerformanceStudio/blob/main/CONTRIBUTING.md)
23-
- [ ] My code builds with zero warnings (`dotnet build -c Debug`)
24-
- [ ] All tests pass (`dotnet test`)
25-
- [ ] I have not introduced any hardcoded credentials or server names
1+
## What does this PR do?
2+
3+
A clear description of the change and why it's being made.
4+
5+
## Which component(s) does this affect?
6+
7+
- [ ] Desktop App (PlanViewer.App)
8+
- [ ] Core Library (PlanViewer.Core)
9+
- [ ] CLI Tool (PlanViewer.Cli)
10+
- [ ] SSMS Extension (PlanViewer.Ssms)
11+
- [ ] Tests
12+
- [ ] Documentation
13+
14+
## How was this tested?
15+
16+
Describe the testing you've done. Include:
17+
- Plan files tested (estimated, actual, Query Store, etc.)
18+
- Platforms tested (Windows, macOS, Linux)
19+
20+
## Checklist
21+
22+
- [ ] I have read the [contributing guide](https://github.com/erikdarlingdata/PerformanceStudio/blob/main/CONTRIBUTING.md)
23+
- [ ] My code builds with zero warnings (`dotnet build -c Debug`)
24+
- [ ] All tests pass (`dotnet test`)
25+
- [ ] I have not introduced any hardcoded credentials or server names

0 commit comments

Comments
 (0)