diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index 6c5abade19bef5..16f083de433be3 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -6,28 +6,73 @@
$(OSGroup)
$(Configuration)
+ $(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)
+
+
+
+
$([MSBuild]::NormalizeDirectory('$(CoreCLROverridePath)'))
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(CoreCLROSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)'))
+ $([MSBuild]::NormalizeDirectory('$(LibrariesOverridePath)'))
+
- $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework'))
+
+
+
+ $(RuntimeIdentifier)
+ $(ArtifactPlatform.Replace('win-', 'Windows_NT-'))
+ $(ArtifactPlatform.Replace('unix-', 'Unix-'))
+ $(ArtifactPlatform.Replace('linux-', 'Linux-'))
+ $(ArtifactPlatform.Replace('osx-', 'OSX-'))
+ $(ArtifactPlatform.Replace('freebsd-', 'FreeBSD-'))
+ $(ArtifactPlatform.Replace('netbsd-', 'NetBSD-'))
+
+ $(ArtifactPlatform.Replace('-', '_'))
+
+ $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'CoreCLRProduct_$(ArtifactPlatform)_$(CoreCLRConfiguration)'))
+ $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'libraries_bin_$(ArtifactPlatform)_$(LibrariesConfiguration)'))
+
+
+ *
+
+
+
+
+ $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(CoreCLROSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)'))
$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))
+ $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))
+
+
+
+
+ $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework'))
$([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'packages', '$(LibrariesConfiguration)'))
$([MSBuild]::NormalizeDirectory('$(LibrariesPackagesDir)', 'Shipping'))
$([MSBuild]::NormalizeDirectory('$(LibrariesPackagesDir)', 'NonShipping'))
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))
-
$([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigurationsArtifactsPath)', 'packages', '$(LibrariesConfiguration)'))
$([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigPackagesDir)', 'Shipping'))
$([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigPackagesDir)', 'NonShipping'))
$([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)'))
$([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'ref', '$(NetCoreAppCurrent)'))
- $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'pkg', '$(NetCoreAppCurrent)', 'runtime', '$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))
- $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'runtime', '$(NetCoreAppCurrent)-$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))
- $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'native', '$(NetCoreAppCurrent)-$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)'))
+ $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'pkg', '$(NetCoreAppCurrent)', 'runtime'))$(LibrariesOSGroupConfigurationArchitecture)\
+ $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'runtime'))$(NetCoreAppCurrent)-$(LibrariesOSGroupConfigurationArchitecture)\
+ $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'native'))$(NetCoreAppCurrent)-$(LibrariesOSGroupConfigurationArchitecture)\
+
x64
x86
x64
@@ -81,12 +126,26 @@
-
+
+
+
+
+
+
+
+
@@ -101,6 +160,7 @@
-