Skip to content

Commit 1282215

Browse files
authored
Move Composite files to easily-found folder (#42296)
- see discussion starting at <#41855 (comment)> - short answer: wildcards do not work in artifact paths
1 parent 4e10270 commit 1282215

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
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

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
466466
DependsOnTargets="_ExpandRuntimePackageRoot">
467467

468468
<PropertyGroup>
469-
<CompositeTargetDir>$(TargetDir)Composite\</CompositeTargetDir>
469+
<CompositeTargetDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'Composite', '$(Configuration)'))</CompositeTargetDir>
470470
<ManagedAssetsFullPath>$(RuntimePackageRoot)$(ManagedAssetsPackagePath)</ManagedAssetsFullPath>
471471
<NativeAssetsFullPath>$(RuntimePackageRoot)$(NativeAssetsPackagePath)</NativeAssetsFullPath>
472472

0 commit comments

Comments
 (0)