Skip to content

Commit

Permalink
[MouseWithoutBorders] - merge main, fix conflicts - microsoft#35155
Browse files Browse the repository at this point in the history
[MouseWithoutBorders] - merge main, fix conflicts - microsoft#35155

Merge branch 'main' into dev/mikeclayton/mwb-common-refactor-machine-stuff

# Conflicts:
#	src/modules/MouseWithoutBorders/App/Class/Common.DragDrop.cs
#	src/modules/MouseWithoutBorders/App/Class/Common.MachineStuff.cs
#	src/modules/MouseWithoutBorders/App/Core/Logger.cs
#	src/modules/MouseWithoutBorders/App/Core/Receiver.cs
#	src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/Logger.PrivateDump.expected.txt
#	src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/LoggerTests.cs
  • Loading branch information
mikeclayton committed Jan 29, 2025
2 parents c024c9c + 458e5c5 commit 04859c8
Show file tree
Hide file tree
Showing 834 changed files with 30,097 additions and 13,777 deletions.
1 change: 0 additions & 1 deletion .configurations/configuration.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ properties:
id: vsPackage
directives:
description: Install Visual Studio 2022 Community (Any edition will work)
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
Expand Down
1 change: 0 additions & 1 deletion .configurations/configuration.vsEnterprise.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ properties:
id: vsPackage
directives:
description: Install Visual Studio 2022 Enterprise (Any edition will work)
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Enterprise
source: winget
Expand Down
1 change: 0 additions & 1 deletion .configurations/configuration.vsProfessional.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ properties:
id: vsPackage
directives:
description: Install Visual Studio 2022 Professional (Any edition will work)
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Professional
source: winget
Expand Down
14 changes: 7 additions & 7 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Protect `.github` folder except the spell-check rules inside it. (The exception happens by not defining any owner user or group for the path.)
# Protection of the spell-check rules makes no sense as it needs to be changed in nearly every PR.
/.github/ @crutkas @DHowett @ethanfangg
/.github/ @microsoft/powertoys-code-owners
/.github/actions/spell-check/

# locking down pipeline folder
/.pipelines/ @crutkas @DHowett @ethanfangg
/.pipelines/ @microsoft/powertoys-code-owners

# locking down nuget config
nuget.config @crutkas @DHowett @ethanfangg
packages.config @crutkas @DHowett @ethanfangg
nuget.config @microsoft/powertoys-code-owners
packages.config @microsoft/powertoys-code-owners

# locking down files that should not change
LICENSE @crutkas @DHowett @ethanfangg
SECURITY.md @crutkas @DHowett @ethanfangg
CODE_OF_CONDUCT.md @crutkas @DHowett @ethanfangg
LICENSE @microsoft/powertoys-code-owners
SECURITY.md @microsoft/powertoys-code-owners
CODE_OF_CONDUCT.md @microsoft/powertoys-code-owners
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ body:
- Shortcut Guide
- System tray interaction
- TextExtractor
- Video Conference Mute
- Workspaces
- Welcome / PowerToys Tour window
- ZoomIt
validations:
required: true

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/translation_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ body:
- Shortcut Guide
- System tray interaction
- TextExtractor
- Video Conference Mute
- Workspaces
- Welcome / PowerToys Tour window
- ZoomIt
validations:
required: true
- type: input
Expand Down
39 changes: 38 additions & 1 deletion .github/actions/spell-check/allow/code.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ Pbgra
WHITEONBLACK


# COUNTRIES
RUS

# FILES

AYUV
Expand Down Expand Up @@ -75,7 +78,14 @@ sinclairinat
stylecop
uipi
yinwang

myaccess
onmicrosoft
aep
epsf
howto
onefuzzconfig
oip
onefuzzingestionpreparationtool

# KEYS

Expand All @@ -87,6 +97,7 @@ EXSEL
HOLDENTER
HOLDESC
HOLDSPACE
HOLDBACKSPACE
KBDLLHOOKSTRUCT
keyevent
LAlt
Expand Down Expand Up @@ -128,6 +139,9 @@ XBUTTONDOWN
XBUTTONUP
XDOWN

# Prefix
pcs

# User32.SYSTEM_METRICS_INDEX.cs

CLEANBOOT
Expand Down Expand Up @@ -220,9 +234,32 @@ TABLETPC
artanh
arsinh
arcosh
roundf

# Linux

dbus
anypass
github
gpg
https
ssh
ubuntu
workarounds

# For upgrade to check-spelling v0.0.24
pwa

# .NET

AOT
Aot

# YML
onefuzz

# NameInCode
leilzh

#Tools
OIP
38 changes: 37 additions & 1 deletion .github/actions/spell-check/allow/names.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ registrypreview
rooler
scoobe
shortcutguide
videoconference


# USERS
Expand All @@ -34,6 +33,7 @@ Adoumie
Advaith
alekhyareddy
Aleks
amihaiuc
angularsen
Anirudha
arjunbalgovind
Expand All @@ -44,7 +44,10 @@ Bartosz
betadele
betsegaw
bricelam
bsky
CCcat
chenmy
chemwolf
Chinh
chrdavis
Chrzan
Expand All @@ -53,6 +56,7 @@ Coplen
craigloewen
crutkas
damienleroy
daverayment
davidegiacometti
debian
Deibisu
Expand All @@ -61,18 +65,24 @@ Deondre
DHowett
ductdo
Essey
Feng
ethanfangg
ferraridavide
foxmsft
frankychen
Gaarden
gaardmark
gabime
Galaxi
Garside
Gershaft
Giordani
Gokce
gordon
grzhan
Guo
hanselman
haoliuu
Harmath
Heiko
Hemmerlein
Expand All @@ -81,25 +91,32 @@ Horvalds
Howett
htcfreek
Huynh
Ionut
jamrobot
Jaswal
jefflord
Jordi
jyuwono
kai
Kairu
Kamra
Kantarci
Karthick
kaylacinnamon
kevinguo
Krigun
Lambson
Laute
laviusmotileng
Leilei
Luecking
Mahalingam
Markovic
martinchrzan
martinmoene
Melman
Mengyuan
Mihaiuc
Mikhayelyan
msft
Mykhailo
Expand All @@ -109,20 +126,25 @@ nathancartlidge
Nemeth
nielslaute
oldnewthing
onegreatworld
palenshus
pedrolamas
Peiyao
peteblois
phoboslab
Ponten
Pooja
Pylyp
Qingpeng
quachpas
Quriz
randyrants
rayment
ricardosantos
riri
ritchielawrence
robmikh
Russinovich
Rutkas
ryanbodrug
saahmedm
Expand All @@ -143,17 +165,31 @@ Taras
TBM
tilovell
Triet
urnotdfs
waaverecords
wang
Whuihuan
Xiaofeng
Xpg
Yaqing
yaqingmi
ycv
yeelam
Yuniardi
yuyoyuppe
Zeol
Zhao
Zhaopeng
zhaopy
zhaoqpcn
Zoltan
Zykova

# OTHERS

Bilibili
BVID
capturevideosample
cmdow
Controlz
cortana
Expand Down
Loading

0 comments on commit 04859c8

Please sign in to comment.