From f399076cb971fcfdab397d8b3786f321acb4b4d5 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Tue, 29 Jun 2021 22:55:22 -0700 Subject: [PATCH] Remove some redundant / unused binplace directories (#54890) * Remove some redundant / unused binplace directories * Fix runtime pack path * Use OuputRid instead of PackageRID On linux-musl, OutputRID differs from PackageRID. * Add RuntimeOS to installer leg for musl So that we have consistent values of $(PackageRID) for installer and libraries * Move LibrariesConfiguration definition earlier in src/tests This property was being defined after a number of places where it was consumed resulting in quite a few inconsistent derived properties. --- Directory.Build.props | 2 +- eng/liveBuilds.targets | 4 +- eng/pipelines/installer/jobs/base-job.yml | 3 ++ .../libraries/prepare-for-bin-publish.yml | 50 ++++++------------- src/libraries/Directory.Build.props | 4 -- src/libraries/Directory.Build.targets | 7 --- .../test_dependencies.csproj | 1 - .../test_dependencies.fsproj | 1 - src/tests/Directory.Build.props | 4 ++ src/tests/Directory.Build.targets | 1 - 10 files changed, 24 insertions(+), 53 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 53be3bd5c9b..d957a798303 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -209,7 +209,7 @@ $([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)')) $([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'data')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.runtime.$(PackageRID)', '$(Configuration)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.runtime.$(PackageRID)', '$(LibrariesConfiguration)')) $([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackDir)', 'runtimes', '$(PackageRID)')) $([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'lib', '$(NetCoreAppCurrent)')) $([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'native')) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 11ea3bf8f3a..01a0c6aac67 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -35,9 +35,9 @@ $([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigPackagesDir)', 'Shipping')) $([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigPackagesDir)', 'NonShipping')) - $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)')) + $(MicrosoftNetCoreAppRefPackRefDir) $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'ref', '$(NetCoreAppCurrent)')) - $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'pkg', '$(NetCoreAppCurrent)', 'runtime'))$(LibrariesTargetOSConfigurationArchitecture)\ + $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir) $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'runtime'))$(NetCoreAppCurrent)-$(LibrariesTargetOSConfigurationArchitecture)\ $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'native'))$(NetCoreAppCurrent)-$(LibrariesTargetOSConfigurationArchitecture)\ diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 35c3728c6f9..22c9b265c7d 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -217,6 +217,8 @@ jobs: # lowercase for RID format. (Detection normally converts, but we're preventing it.) - name: OutputRidArg value: /p:OutputRid=linux-musl-${{ parameters.archType }} + - name: RuntimeOSArg + value: /p:RuntimeOS=linux-musl - name: _PortableBuild value: true @@ -231,6 +233,7 @@ jobs: $(LiveOverridePathArgs) $(CommonMSBuildArgs) $(OutputRidArg) + $(RuntimeOSArg) - name: PublishArguments value: >- diff --git a/eng/pipelines/libraries/prepare-for-bin-publish.yml b/eng/pipelines/libraries/prepare-for-bin-publish.yml index fa71beaae65..fbdb90f1871 100644 --- a/eng/pipelines/libraries/prepare-for-bin-publish.yml +++ b/eng/pipelines/libraries/prepare-for-bin-publish.yml @@ -6,46 +6,24 @@ parameters: steps: - ${{ if ne(parameters.isOfficialBuild, true) }}: - task: CopyFiles@2 - displayName: Prepare testhost folder to publish + displayName: Prepare bin folders to publish (unofficial build) inputs: - sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/testhost - targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/testhost + sourceFolder: $(Build.SourcesDirectory)/artifacts/bin + targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin + contents: | + ref/** + runtime/** + testhost/** - - task: CopyFiles@2 - displayName: Prepare runtime folder to publish - inputs: - sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/runtime - targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/runtime - - - task: CopyFiles@2 - displayName: Prepare ref folder to publish - inputs: - sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/ref - targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/ref - - - task: CopyFiles@2 - displayName: Prepare shared framework ref assemblies to publish - inputs: - sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/ref/microsoft.netcore.app - targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/ref/microsoft.netcore.app - - - task: CopyFiles@2 - displayName: Prepare docs folder to publish - inputs: - sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/docs - targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/docs - - - task: CopyFiles@2 - displayName: Prepare shared framework runtime folder to publish - inputs: - sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/pkg - targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/pkg - - task: CopyFiles@2 - displayName: Prepare native folder to publish + displayName: Prepare bin folders to publish inputs: - sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/native - targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/native + sourceFolder: $(Build.SourcesDirectory)/artifacts/bin + targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin + contents: | + docs/** + microsoft.netcore.app.*/** + native/** - task: CopyFiles@2 displayName: Prepare artifacts packages folder to publish diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 0078c1331d3..3981181ee92 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -128,10 +128,6 @@ $(TestArchiveTestsRoot)$(OSPlatformConfig)/ $(TestArchiveRoot)runtime/ - - $(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\ref - $(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\lib - $(ArtifactsBinDir)pkg\aspnetcoreapp\ref $(ArtifactsBinDir)pkg\aspnetcoreapp\lib diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 051d90878db..d4b5f1ac040 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -85,15 +85,8 @@ $(NetCoreAppCurrentRuntimePath) - - $(NETCoreAppPackageRuntimePath) - $(NETCoreAppPackageRefPath) - $(NETCoreAppPackageRuntimePath) - $(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture) - $(RefRootPath)microsoft.netcore.app\$(Configuration) - $(NETCoreAppPackageRuntimePath)\..\runtime\$(TargetOS)-$(Configuration)-$(TargetArchitecture) diff --git a/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj b/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj index 6a544c39f98..c23ba6368a4 100644 --- a/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj +++ b/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj @@ -7,7 +7,6 @@ true win-arm;win-arm64;win-x64;win-x86;$(PackageRID) true - Release diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index b714b27db2e..f00de4d102e 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -1,5 +1,9 @@ + + Release + + diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index cf36a8cdf61..71494ce1d6a 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -265,7 +265,6 @@ true - Release -- GitLab