|
15 | 15 | We can't use NETCoreSdkRuntimeIdentifier here as the Arcade SDK projects don't import the .NET SDK. |
16 | 16 | Instead, just make sure we include the assets targeting "not the output rid", which will catch the host assets. |
17 | 17 | --> |
18 | | - <ItemGroup Condition="'$(EnableDefaultRidSpecificArtifacts)' != 'true' and '$(DotNetBuildOrchestrator)' == 'true'"> |
| 18 | + <ItemGroup Condition="'$(EnableDefaultRidSpecificArtifacts)' != 'true' and '$(DotNetBuildFromVMR)' == 'true'"> |
19 | 19 | <_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.NETCore.ILAsm.*.nupkg" |
20 | 20 | Exclude="$(ArtifactsPackagesDir)**\runtime.$(TargetRid).Microsoft.NETCore.ILAsm.*.nupkg" /> |
21 | 21 |
|
|
51 | 51 | This ensures that we don't produce these files in the "Repo source build" builds, |
52 | 52 | but we do produce them in both the VMR and the runtime official build. |
53 | 53 | --> |
54 | | - <PropertyGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'"> |
| 54 | + <PropertyGroup Condition="'$(DotNetBuildFromVMR)' == 'true'"> |
55 | 55 | <ShouldGenerateProductVersionFiles Condition="'$(TargetRid)' == 'win-x64' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">true</ShouldGenerateProductVersionFiles> |
56 | 56 | <ShouldGenerateProductVersionFiles Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</ShouldGenerateProductVersionFiles> |
57 | 57 | </PropertyGroup> |
|
89 | 89 | DependsOnTargets="GetNonStableProductVersion" |
90 | 90 | BeforeTargets="PublishToAzureDevOpsArtifacts" |
91 | 91 | AfterTargets="GenerateChecksumsFromArtifacts"> |
92 | | - <ItemGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'"> |
| 92 | + <ItemGroup Condition="'$(DotNetBuildFromVMR)' == 'true'"> |
93 | 93 | <Artifact Condition="'%(Artifact.Kind)' != 'Package' and '%(Artifact.RelativeBlobPath)' == ''" |
94 | 94 | RelativeBlobPath="Runtime/$(NonStableProductVersion)/%(Artifact.SubBlobFolder)%(Filename)%(Extension)" /> |
95 | 95 | </ItemGroup> |
96 | 96 | <!-- In vertical dotnet/runtime legs outside of the VMR, set the "relative blob path" to shipping vs non-shipping to make our download/upload work. --> |
97 | | - <ItemGroup Condition="'$(DotNetBuildOrchestrator)' != 'true'"> |
| 97 | + <ItemGroup Condition="'$(DotNetBuildFromVMR)' != 'true'"> |
98 | 98 | <Artifact Condition="'%(Artifact.Kind)' == 'Blob' and '%(Artifact.IsShipping)' == 'true'" |
99 | 99 | RelativeBlobPath="packages/$(Configuration)/Shipping/%(Filename)%(Extension)" /> |
100 | 100 | <Artifact Condition="'%(Artifact.Kind)' == 'Blob' and '%(Artifact.IsShipping)' != 'true'" |
|
0 commit comments