Skip to content

Commit 8de3589

Browse files
committed
Merge from master
2 parents 33cd89a + 1d8b9f5 commit 8de3589

35 files changed

+589
-702
lines changed

.github/actions/spelling/expect.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Browsable
6868
BSODs
6969
Buf
7070
buildtransitive
71+
buildtrees
7172
cancelledbyuser
7273
casemap
7374
casemappings
@@ -113,6 +114,7 @@ dacl
113114
datetimeoffset
114115
Dbg
115116
Dcom
117+
DCPPREST
116118
debian
117119
decompressor
118120
dedupe
@@ -126,6 +128,7 @@ desktopappinstaller
126128
devblogs
127129
devhome
128130
DFX
131+
DHAVE
129132
dic
130133
diskfull
131134
DISPLAYCATALOG
@@ -139,6 +142,7 @@ dustojnikhummer
139142
dvinns
140143
dwgs
141144
dwrite
145+
DYAML
142146
ecfr
143147
ecfrbrowse
144148
EFGH
@@ -468,6 +472,7 @@ rwgch
468472
rwgs
469473
ryfu
470474
sacl
475+
sancov
471476
SARL
472477
savepoint
473478
sawgc
@@ -599,7 +604,7 @@ winreg
599604
winrtact
600605
winstring
601606
WMI
602-
Wnd
607+
wnd
603608
WNDCLASS
604609
WNDCLASSEX
605610
workaround

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ settings.json
2020
[Rr]eleases/
2121
x64/
2222
x86/
23+
arm64/
2324
AnyCPU/
2425
Fuzzing/
2526
bld/

azure-pipelines.loc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
1515
jobs:
1616
- job: Localize
1717
pool:
18-
vmImage: windows-2019
18+
vmImage: windows-latest
1919
variables:
2020
skipComponentGovernanceDetection: true
2121
tdbuildTeamId: 8343
2222
steps:
2323
# Upload client resources
24-
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4
24+
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@5
2525
displayName: Send resources to Touchdown Build
2626
inputs:
2727
teamId: $(tdbuildTeamId)
@@ -34,7 +34,7 @@ jobs:
3434

3535
# Upload Group Policy ADML
3636
# Do it as a separate step as we need the result in a different location
37-
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4
37+
- task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@5
3838
displayName: Send ADML to Touchdown Build
3939
inputs:
4040
teamId: $(tdbuildTeamId)
@@ -58,4 +58,4 @@ jobs:
5858
condition: eq(variables['hasChanges'], '1')
5959
inputs:
6060
artifactName: Patch
61-
targetPath: $(Build.ArtifactStagingDirectory)
61+
targetPath: $(Build.ArtifactStagingDirectory)

azure-pipelines.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,10 @@ jobs:
5050
x86_release:
5151
buildConfiguration: 'Release'
5252
buildPlatform: 'x86'
53-
testBuildConfiguration: 'TestRelease'
5453
artifactIdentifier: 'x86release'
5554
x64_release:
5655
buildConfiguration: 'Release'
5756
buildPlatform: 'x64'
58-
testBuildConfiguration: 'TestRelease'
5957
artifactIdentifier: 'x64release'
6058

6159
variables:
@@ -123,19 +121,6 @@ jobs:
123121
/p:UapAppxPackageBuildMode=SideloadOnly'
124122
maximumCpuCount: true
125123

126-
- task: VSBuild@1
127-
displayName: Build Test Project
128-
inputs:
129-
platform: '$(buildPlatform)'
130-
solution: '$(solution)'
131-
configuration: '$(testBuildConfiguration)'
132-
msbuildArgs: '/bl:$(artifactsDir)\msbuild-testProject.binlog
133-
/p:AppxBundlePlatforms="$(buildPlatform)"
134-
/p:AppxPackageDir="$(appxPackageDir)"
135-
/p:AppxBundle=Always
136-
/p:UapAppxPackageBuildMode=SideloadOnly'
137-
maximumCpuCount: true
138-
139124
- task: MSBuild@1
140125
displayName: Build MSIX Test Installer File
141126
inputs:
@@ -148,6 +133,14 @@ jobs:
148133
/p:AppxPackageSigningEnabled=false'
149134
maximumCpuCount: true
150135

136+
- task: CopyFiles@2
137+
displayName: Copy vcpkg logs
138+
inputs:
139+
SourceFolder: $(VCPKG_INSTALLATION_ROOT)\buildtrees
140+
Contents: '**\*.log'
141+
TargetFolder: '$(artifactsDir)\vcpkgLogs'
142+
condition: succeededOrFailed()
143+
151144
- task: CopyFiles@2
152145
displayName: 'Copy specific build artifacts'
153146
inputs:
@@ -285,6 +278,7 @@ jobs:
285278
inputs:
286279
targetPath: '$(artifactsDir)'
287280
artifact: 'Build.$(artifactIdentifier)'
281+
condition: succeededOrFailed()
288282

289283
- task: ComponentGovernanceComponentDetection@0
290284
displayName: Component Governance
@@ -305,12 +299,10 @@ jobs:
305299
x86_release:
306300
buildConfiguration: 'Release'
307301
buildPlatform: 'x86'
308-
testBuildConfiguration: 'TestRelease'
309302
artifactIdentifier: 'x86release'
310303
x64_release:
311304
buildConfiguration: 'Release'
312305
buildPlatform: 'x64'
313-
testBuildConfiguration: 'TestRelease'
314306
artifactIdentifier: 'x64release'
315307

316308
variables:
@@ -639,6 +631,14 @@ jobs:
639631
msbuildArgs: '/bl:$(artifactsDir)\msbuild.binlog'
640632
maximumCpuCount: true
641633

634+
- task: CopyFiles@2
635+
displayName: Copy vcpkg logs
636+
inputs:
637+
SourceFolder: $(VCPKG_INSTALLATION_ROOT)\buildtrees
638+
Contents: '**\*.log'
639+
TargetFolder: '$(artifactsDir)\vcpkgLogs'
640+
condition: succeededOrFailed()
641+
642642
- task: CopyFiles@2
643643
displayName: Copy Fuzzing Artifacts for Publishing
644644
inputs:
@@ -650,6 +650,7 @@ jobs:
650650
displayName: Publish Fuzzing Artifacts
651651
inputs:
652652
targetPath: '$(artifactsDir)'
653+
condition: succeededOrFailed()
653654

654655
- task: onefuzz-task@0
655656
inputs:

doc/ReleaseNotes.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
## New in v1.11
2-
* Dropped support for running on 32-bit ARM
3-
* Support for [Microsoft Desired State Configuration (DSC) v3](https://learn.microsoft.com/powershell/dsc/overview?view=dsc-3.0).
4-
* Support for exporting the configuration of the current device. This includes Windows Settings, packages from configured WinGet sources, and package settings from DSC v3 enabled packages.
1+
## New in v1.12
2+
*No applicable update found*
53

64
## Experimental Features
75
* Experimental support for Fonts

0 commit comments

Comments
 (0)