diff --git a/Directory.Build.props b/Directory.Build.props
index 53be3bd5c9b01478abb2aa6b290bb138d829dd0d..d957a798303ade27e0f40870a94a84522675d5df 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 11ea3bf8f3aea74c56bbcbe7cba24d7f00ec02fa..01a0c6aac679aecf0d12896b33844ef39605ac97 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 35c3728c6f973924ccfdb5eeab53c848409008c7..22c9b265c7d3a211560e56ca21a723b46f9afe9b 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 fa71beaae65fd129bb5b746c28e9ad30c0282a8a..fbdb90f18716b380e92c6cb872d2f4963c22204d 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 0078c1331d34d8535625ed84b0170f7fb5779678..3981181ee920ca1136f2eb93699b2d8a3652e2d5 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 051d90878db1af8fbbfc10e22ce48d41cb222090..d4b5f1ac040b0962c5b9e70ea7c5e109556638f7 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 6a544c39f98376a29821114ae8dd172cb95f32ff..c23ba6368a498a31123c8df5d817d8841a85b349 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 b714b27db2e088600e13982f6c80d7643a7024df..f00de4d102e503e5221e7b9cad065c478aeba322 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 cf36a8cdf61b02c8570378b270a4528a004aff38..71494ce1d6aaf03187877f73f942e21b6172bf3e 100644
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -265,7 +265,6 @@
true
- Release