Skip to content

Commit fa8121b

Browse files
authored
Merge branch 'master' into PinPlus
2 parents 0c80e10 + 09f6afd commit fa8121b

33 files changed

Lines changed: 4837 additions & 78 deletions

.config/configuration.vsEnterprise.winget

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ properties:
1313
- resource: Microsoft.WinGet.DSC/WinGetPackage
1414
id: vsPackage
1515
directives:
16-
description: Install Visual Studio 2022 Enterprise
16+
description: Install Visual Studio 2026 Enterprise
1717
# Requires elevation for the set operation
1818
securityContext: elevated
1919
settings:
20-
id: Microsoft.VisualStudio.2022.Enterprise
20+
id: Microsoft.VisualStudio.Enterprise
2121
source: winget
2222
- resource: Microsoft.VisualStudio.DSC/VSComponents
2323
dependsOn:
@@ -29,6 +29,6 @@ properties:
2929
allowPrerelease: true
3030
settings:
3131
productId: Microsoft.VisualStudio.Product.Enterprise
32-
channelId: VisualStudio.17.Release
32+
channelId: VisualStudio.18.Release
3333
vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
3434
configurationVersion: 0.2.0

.config/configuration.vsProfessional.winget

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ properties:
1313
- resource: Microsoft.WinGet.DSC/WinGetPackage
1414
id: vsPackage
1515
directives:
16-
description: Install Visual Studio 2022 Professional
16+
description: Install Visual Studio 2026 Professional
1717
# Requires elevation for the set operation
1818
securityContext: elevated
1919
settings:
20-
id: Microsoft.VisualStudio.2022.Professional
20+
id: Microsoft.VisualStudio.Professional
2121
source: winget
2222
- resource: Microsoft.VisualStudio.DSC/VSComponents
2323
dependsOn:
@@ -29,6 +29,6 @@ properties:
2929
allowPrerelease: true
3030
settings:
3131
productId: Microsoft.VisualStudio.Product.Professional
32-
channelId: VisualStudio.17.Release
32+
channelId: VisualStudio.18.Release
3333
vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
3434
configurationVersion: 0.2.0

.config/configuration.winget

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ properties:
1313
- resource: Microsoft.WinGet.DSC/WinGetPackage
1414
id: vsPackage
1515
directives:
16-
description: Install Visual Studio 2022 Community
16+
description: Install Visual Studio 2026 Community
1717
# Requires elevation for the set operation
1818
securityContext: elevated
1919
settings:
20-
id: Microsoft.VisualStudio.2022.Community
20+
id: Microsoft.VisualStudio.Community
2121
source: winget
2222
- resource: Microsoft.VisualStudio.DSC/VSComponents
2323
dependsOn:
@@ -29,6 +29,6 @@ properties:
2929
allowPrerelease: true
3030
settings:
3131
productId: Microsoft.VisualStudio.Product.Community
32-
channelId: VisualStudio.17.Release
32+
channelId: VisualStudio.18.Release
3333
vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
3434
configurationVersion: 0.2.0

.gitattributes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@
1111

1212
# External PowerShell files are signed, so we must preserve the exact content instead of
1313
# normalizing line endings.
14-
src/PowerShell/ExternalModules/**/* -text
14+
src/PowerShell/ExternalModules/**/* -text
15+
16+
.github/workflows/*.lock.yml linguist-generated=true merge=ours

.github/actions/spelling/allow.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ motw
182182
mrm
183183
msb
184184
msdata
185+
msftbot
185186
MSHCTX
186187
MSHLFLAGS
187188
msiexec
@@ -362,6 +363,7 @@ TEXTFORMAT
362363
TEXTINCLUDE
363364
threadpool
364365
TOCTOU
366+
toolsets
365367
tpl
366368
TRACELOGGING
367369
triaged

.github/aw/actions-lock.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"entries": {
3+
"github/gh-aw-actions/setup@v0.83.4": {
4+
"repo": "github/gh-aw-actions/setup",
5+
"version": "v0.83.4",
6+
"sha": "e89c65e17eb281bbd5ff2ff9e9199a03e96654c7"
7+
}
8+
}
9+
}

.github/policies/labelAdded.noRecentActivity.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ configuration:
1818
then:
1919
- addReply:
2020
reply: >-
21-
Hello @${issueAuthor},
21+
Hello ${issueAuthor},
2222
2323
2424
This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
2525
2626
27-
Template: msftbot/noRecentActivity
27+
###### Template: msftbot/noRecentActivity
2828
# The policy service should trigger even when the label was added by the policy service
2929
triggerOnOwnActions: true
3030
- description: >-
@@ -37,13 +37,13 @@ configuration:
3737
then:
3838
- addReply:
3939
reply: >-
40-
Hello @${issueAuthor},
40+
Hello ${issueAuthor},
4141
4242
4343
This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
4444
4545
46-
Template: msftbot/noRecentActivity
46+
###### Template: msftbot/noRecentActivity
4747
# The policy service should trigger even when the label was added by the policy service
4848
triggerOnOwnActions: true
4949
onFailure:

.github/policies/labelManagement.issueOpened.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ configuration:
4444
Instead of this PR, it would be helpful if you could [open an issue](https://github.com/microsoft/winget-cli/issues/new?template=Localization_Issue.yml) and it will be forwarded to the internal localization team for review. For more information, please see the [Development Guide](https://github.com/microsoft/winget-cli/blob/master/doc/Developing.md#localization).
4545
4646
47-
Template: msftbot/PullRequests/LocalizationFileChange
47+
###### Template: msftbot/PullRequests/LocalizationFileChange
4848
- description: Add Needs-Triage to new issues
4949
if:
5050
- payloadType: Issues

.github/policies/labelManagement.needsFeedbackHub.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ configuration:
3535
then:
3636
- addReply:
3737
reply: >-
38-
Hello @${issueAuthor},
38+
Hello ${issueAuthor},
3939
4040
4141
Please send us feedback with the Feedback Hub [Windows]+[f] with this issue and paste the link here so we can more easily find your crash information on the back end.
@@ -46,7 +46,7 @@ configuration:
4646
The link on the bottom of the feedback report will provide the URL to paste in this Issue to share with us.
4747
4848
49-
Template: msftbot/feedbackHub
49+
###### Template: msftbot/feedbackHub
5050
- assignTo:
5151
author: True
5252
- addLabel:

.github/policies/moderatorTriggers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,13 +556,13 @@ configuration:
556556
then:
557557
- addReply:
558558
reply: >-
559-
Hello @${issueAuthor},
559+
Hello ${issueAuthor},
560560
561561
562562
We've identified this as a duplicate of another issue or PR that already exists. This specific instance is being closed in favor of the linked issue. Please add your 👍 to the other issue to raise its priority. Thanks for your contribution!
563563
564564
565-
Template: msftbot/duplicate/closed
565+
###### Template: msftbot/duplicate/closed
566566
- closeIssue
567567
- removeLabel:
568568
label: Needs-Triage

0 commit comments

Comments
 (0)