Skip to content

Commit 5278675

Browse files
vanzuevanzue
committed
fix conflict
2 parents 12baf82 + 3385d1d commit 5278675

File tree

1,199 files changed

+69489
-9837
lines changed

Some content is hidden

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

1,199 files changed

+69489
-9837
lines changed

‎.claude/CLAUDE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.github/copilot-instructions.md

‎.claude/agents‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.github/agents

‎.claude/commands‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.github/prompts

‎.claude/rules‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.github/instructions

‎.claude/skills‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.github/skills

‎.config/configuration.vsEnterprise.winget‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
2-
# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
2+
# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#getting-started
33
properties:
44
resources:
55
- resource: Microsoft.Windows.Settings/WindowsSettings
@@ -13,11 +13,11 @@ properties:
1313
- resource: Microsoft.WinGet.DSC/WinGetPackage
1414
id: vsPackage
1515
directives:
16-
description: Install Visual Studio 2022 Enterprise (Any edition will work)
16+
description: Install Visual Studio 2026 Enterprise (Any edition will work)
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,7 +29,7 @@ properties:
2929
securityContext: elevated
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
3535

‎.config/configuration.vsProfessional.winget‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
2-
# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
2+
# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#getting-started
33
properties:
44
resources:
55
- resource: Microsoft.Windows.Settings/WindowsSettings
@@ -13,11 +13,11 @@ properties:
1313
- resource: Microsoft.WinGet.DSC/WinGetPackage
1414
id: vsPackage
1515
directives:
16-
description: Install Visual Studio 2022 Professional (Any edition will work)
16+
description: Install Visual Studio 2026 Professional (Any edition will work)
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,7 +29,7 @@ properties:
2929
securityContext: elevated
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
3535

‎.config/configuration.winget‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
2-
# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
2+
# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#getting-started
33
properties:
44
resources:
55
- resource: Microsoft.Windows.Settings/WindowsSettings
@@ -13,11 +13,11 @@ properties:
1313
- resource: Microsoft.WinGet.DSC/WinGetPackage
1414
id: vsPackage
1515
directives:
16-
description: Install Visual Studio 2022 Community (Any edition will work)
16+
description: Install Visual Studio 2026 Community (Any edition will work)
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,7 +29,7 @@ properties:
2929
securityContext: elevated
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
3535

‎.github/actions/spell-check/allow/code.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Gbps
3838
gcode
3939
Heatshrink
4040
Mbits
41+
Kbits
4142
MBs
4243
mkv
4344
msix
@@ -97,6 +98,7 @@ Yubico
9798
Perplexity
9899
Groq
99100
svgl
101+
devhome
100102

101103
# KEYS
102104

@@ -322,6 +324,7 @@ REGSTR
322324

323325
# Misc Win32 APIs and PInvokes
324326
INVOKEIDLIST
327+
MEMORYSTATUSEX
325328

326329
# PowerRename metadata pattern abbreviations (used in tests and regex patterns)
327330
DDDD
@@ -342,3 +345,7 @@ reportbug
342345
#ffmpeg
343346
crf
344347
nostdin
348+
349+
# Performance counter keys
350+
engtype
351+
Nonpaged

‎.github/actions/spell-check/allow/names.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ ycv
192192
yeelam
193193
Yuniardi
194194
yuyoyuppe
195+
zadjii
195196
Zeol
196197
Zhao
197198
Zhaopeng
@@ -228,6 +229,7 @@ regedit
228229
roslyn
229230
Skia
230231
Spotify
232+
taskmgr
231233
tldr
232234
Vanara
233235
wangyi
@@ -243,4 +245,3 @@ xamlstyler
243245
Xavalon
244246
Xbox
245247
Youdao
246-
zadjii

0 commit comments

Comments
 (0)