Skip to content

Commit 16efeac

Browse files
committed
Merge remote-tracking branch 'origin/main' into sebros/outputcaching
# Conflicts: # src/submodules/googletest
2 parents aa89f7c + 9a74d3b commit 16efeac

File tree

145 files changed

+6887
-5097
lines changed

Some content is hidden

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

145 files changed

+6887
-5097
lines changed

.azure/pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ stages:
294294
- name: Windows_ANCMIISExpress_Msi
295295
path: artifacts/bin/AncmIISExpressV2
296296
- name: Windows_CompositeImages
297-
path: artifacts/bin/Microsoft.AspNetCore.App.Runtime/**/Composite
297+
path: artifacts/obj/Composite/Release
298298

299299
# Build Windows ARM
300300
- template: jobs/default-build.yml

0 commit comments

Comments
 (0)