Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions eng/Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,15 @@
<PropertyGroup Condition=" '$(DotNetBuildPass)' == '2' " >
<RestoreUsingNuGetTargets>false</RestoreUsingNuGetTargets>
</PropertyGroup>

<PropertyGroup>
<!--
Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
- If we're building outside of the VMR, publish these assets from the Windows job.
- If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
-->
<PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
</PropertyGroup>
</Project>
11 changes: 1 addition & 10 deletions eng/Publishing.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project>
<Import Project="Common.props" />

Check failure on line 2 in eng/Publishing.props

View check run for this annotation

Azure Pipelines / aspnetcore-ci (Build Source-Build (Managed))

eng/Publishing.props#L2

eng/Publishing.props(2,3): error MSB4011: "/__w/1/s/eng/Common.props" cannot be imported again. It was already imported at "/__w/1/s/eng/Signing.props (3,3)". This is most likely a build authoring error. This subsequent import will be ignored. [/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/10.0.0-beta.25171.1/tools/Publish.proj]

Check failure on line 2 in eng/Publishing.props

View check run for this annotation

Azure Pipelines / aspnetcore-ci (Build Build: macOS x64)

eng/Publishing.props#L2

eng/Publishing.props(2,3): error MSB4011: "/Users/runner/work/1/s/eng/Common.props" cannot be imported again. It was already imported at "/Users/runner/work/1/s/eng/Signing.props (3,3)". This is most likely a build authoring error. This subsequent import will be ignored. [/Users/runner/work/1/s/.packages/microsoft.dotnet.arcade.sdk/10.0.0-beta.25171.1/tools/Publish.proj]

Check failure on line 2 in eng/Publishing.props

View check run for this annotation

Azure Pipelines / aspnetcore-ci (Build Build: Linux Musl x64)

eng/Publishing.props#L2

eng/Publishing.props(2,3): error MSB4011: "/__w/1/s/eng/Common.props" cannot be imported again. It was already imported at "/__w/1/s/eng/Signing.props (3,3)". This is most likely a build authoring error. This subsequent import will be ignored. [/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/10.0.0-beta.25171.1/tools/Publish.proj]

Check failure on line 2 in eng/Publishing.props

View check run for this annotation

Azure Pipelines / aspnetcore-ci (Build Build: Linux Musl ARM)

eng/Publishing.props#L2

eng/Publishing.props(2,3): error MSB4011: "/__w/1/s/eng/Common.props" cannot be imported again. It was already imported at "/__w/1/s/eng/Signing.props (3,3)". This is most likely a build authoring error. This subsequent import will be ignored. [/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/10.0.0-beta.25171.1/tools/Publish.proj]

Check failure on line 2 in eng/Publishing.props

View check run for this annotation

Azure Pipelines / aspnetcore-ci (Build Build: Linux Musl ARM64)

eng/Publishing.props#L2

eng/Publishing.props(2,3): error MSB4011: "/__w/1/s/eng/Common.props" cannot be imported again. It was already imported at "/__w/1/s/eng/Signing.props (3,3)". This is most likely a build authoring error. This subsequent import will be ignored. [/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/10.0.0-beta.25171.1/tools/Publish.proj]

Check failure on line 2 in eng/Publishing.props

View check run for this annotation

Azure Pipelines / aspnetcore-ci (Build Build: Linux ARM)

eng/Publishing.props#L2

eng/Publishing.props(2,3): error MSB4011: "/home/vsts/work/1/s/eng/Common.props" cannot be imported again. It was already imported at "/home/vsts/work/1/s/eng/Signing.props (3,3)". This is most likely a build authoring error. This subsequent import will be ignored. [/home/vsts/work/1/s/.packages/microsoft.dotnet.arcade.sdk/10.0.0-beta.25171.1/tools/Publish.proj]

<PropertyGroup>
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
Expand All @@ -14,16 +15,6 @@

<!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>

<!--
Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
- If we're building outside of the VMR, publish these assets from the Windows job.
- If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
-->
<PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
<PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == ''">$(PublishAllBuildsAssetsInThisJob)</PublishInstallerBaseVersion>
</PropertyGroup>

<!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->
Expand Down
Loading