diff --git a/Directory.Build.props b/Directory.Build.props
index 7efd3a57291691..21234e4440e014 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -83,6 +83,7 @@
$([MSBuild]::NormalizePath('$(WasmBuildTasksDir)', 'WasmBuildTasks.dll'))
$([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))
$([MSBuild]::NormalizePath('$(RuntimeConfigParserDir)', 'RuntimeConfigParser.dll'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
new file mode 100644
index 00000000000000..7dfc80d41fd14c
--- /dev/null
+++ b/eng/SourceBuild.props
@@ -0,0 +1,73 @@
+
+
+
+ runtime
+
+
+
+
+ ./build.sh
+
+ true
+ false
+
+
+ $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)
+ $(__DistroRid)
+
+
+ <_targetRidPlatformIndex>$(TargetRid.LastIndexOfAny("-"))
+ $(TargetRid.Substring(0, $(_targetRidPlatformIndex)))
+ $(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))
+
+ minimal
+
+
+
+
+
+
+
+
+
+
+
+
+ $(InnerBuildArgs) --arch $(TargetRidPlatform)
+ $(InnerBuildArgs) --configuration $(Configuration)
+ $(InnerBuildArgs) --ci
+ $(InnerBuildArgs) --allconfigurations
+ $(InnerBuildArgs) --verbosity $(LogVerbosity)
+ $(InnerBuildArgs) --nodereuse false
+ $(InnerBuildArgs) --warnAsError false
+ $(InnerBuildArgs) --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE
+ $(InnerBuildArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0
+ $(InnerBuildArgs) /p:ContinuousIntegrationBuild=true
+ $(InnerBuildArgs) /p:PackageRid=$(TargetRid)
+ $(InnerBuildArgs) /p:NoPgoOptimize=true
+ $(InnerBuildArgs) /p:KeepNativeSymbols=true
+ $(InnerBuildArgs) /p:RuntimeOS=$(TargetRidWithoutPlatform)
+ $(InnerBuildArgs) /p:PortableBuild=$(SourceBuildPortable)
+ $(InnerBuildArgs) /p:BuildDebPackage=false
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
new file mode 100644
index 00000000000000..c1b6dfbf053817
--- /dev/null
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/eng/Subsets.props b/eng/Subsets.props
index bf6b25bffc7317..105b34254c6c2b 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -25,8 +25,8 @@
clr+mono+libs+host+packs
mono+libs+packs
-
- clr+libs+host+packs
+
+ clr+libs+host+packs
@@ -49,18 +49,21 @@
$(DefaultMonoSubsets)mono.wasmruntime+
$(DefaultMonoSubsets)mono.aotcross+
$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages
-
+
libs.native+
- $(DefaultLibrariesSubsets)libs.ref+libs.src+libs.pretest+libs.packages
+ $(DefaultLibrariesSubsets)libs.ref+libs.src+libs.packages
+ $(DefaultLibrariesSubsets)+libs.pretest
- host.native+host.pkg+host.tools+host.tests
+ host.native+host.tools
+ $(DefaultHostSubsets)+host.pkg+host.tests
host.native
packs.product
$(DefaultPacksSubsets)+packs.tests
+ $(DefaultPacksSubsets)+packs.installers
@@ -204,12 +207,12 @@
+ $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
+
+ Test="true" Category="clr" Condition="'$(__DistroRid)' != 'linux-musl-x64' and '$(DotNetBuildFromSource)' != 'true'"/>
@@ -221,7 +224,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2485b69e1147ac..5b1b0c6775a1f9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,6 +9,7 @@
https://github.com/dotnet/arcade
4a2b475948d498b89fedef7cf890883f49bc1ea3
+
https://github.com/dotnet/arcade
diff --git a/eng/packaging.props b/eng/packaging.props
index 87cecef871a697..534d3ddcf321b4 100644
--- a/eng/packaging.props
+++ b/eng/packaging.props
@@ -16,10 +16,6 @@
-
- false
-
- true
false
diff --git a/eng/restore/harvestPackages.targets b/eng/restore/harvestPackages.targets
index a7fc8aa34655f5..07eb5a91a7a8ed 100644
--- a/eng/restore/harvestPackages.targets
+++ b/eng/restore/harvestPackages.targets
@@ -1,4 +1,14 @@
+
+
+ $(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\
+ $(PackagingTaskAssembly)netcoreapp3.1\
+ $(PackagingTaskAssembly)net472\
+
+ $(PackagingTaskAssembly)net5.0\
+ $(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll
+
+
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index cc5a02e38691df..9e403d02d13b8a 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -28,7 +28,6 @@
net461;net462;net47;net471;net472
- $(AdditionalBuildTargetFrameworks);netstandard2.0
diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
index 2f4d0949db3ef6..383dd088e127c0 100644
--- a/src/libraries/libraries-packages.proj
+++ b/src/libraries/libraries-packages.proj
@@ -1,20 +1,11 @@
-
- $(AdditionalBuildTargetFrameworks);package-$(Configuration)
-
-
-
- $(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\
- $(PackagingTaskAssembly)netcoreapp3.1\
- $(PackagingTaskAssembly)net472\
- $(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll
-
-
+
+
@@ -31,7 +22,6 @@
ones that might do this. After we ship a stable set of packages this target should be ran and the
changes to the package index should be commited to the repo.
-->
-