From 9c85652e952540ed8a008a1443edb9c89b931c04 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 14 Nov 2019 15:59:16 -0800 Subject: [PATCH 01/29] Convert libraries and installer to use a live CoreCLR. --- Directory.Build.targets | 5 +- eng/Version.Details.xml | 4 - eng/Versions.props | 1 - eng/liveBuilds.targets | 57 ++++++++ src/installer/Directory.Build.props | 2 +- .../pkg/projects/Directory.Build.targets | 4 +- .../src/localnetcoreapp.override.targets | 129 +++++++++--------- .../netcoreapp/src/netcoreapp.depproj | 56 +------- src/libraries/Directory.Build.props | 8 +- src/libraries/restore/runtime/runtime.depproj | 40 ++---- 10 files changed, 151 insertions(+), 155 deletions(-) create mode 100644 eng/liveBuilds.targets diff --git a/Directory.Build.targets b/Directory.Build.targets index 5180c31001b64c..1344122a8024d4 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,4 @@ - + - - \ No newline at end of file + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcba33aff89a59..6df8d3b5d0d45c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -28,10 +28,6 @@ https://github.com/dotnet/corefx 5cee7c97d602f294e27c582d4dab81ec388f1d7b - - https://github.com/dotnet/coreclr - 2c4fb3250989f014550882f5d165cdc36ebdbd08 - https://github.com/dotnet/coreclr 2c4fb3250989f014550882f5d165cdc36ebdbd08 diff --git a/eng/Versions.props b/eng/Versions.props index 38eeb0ba742136..46026ae78e7d51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,6 @@ 3.0.0 5.0.0-alpha1.19563.3 - 5.0.0-alpha1.19563.3 5.0.0-alpha1.19563.3 5.0.0-alpha.1.19563.6 diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets new file mode 100644 index 00000000000000..cb128489a28ce4 --- /dev/null +++ b/eng/liveBuilds.targets @@ -0,0 +1,57 @@ + + + + $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) + $(Configuration) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr', 'bin', 'Product', '$(OSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)')) + x64 + x86 + x64 + + + + + + $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)')) + + + $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','sharedFramework')) + $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','$(CoreCLRCrossTargetComponentDir)','sharedFramework')) + + + + + + + true + + + + + + + + runtime/$(RuntimeIdentifier)/native + + + + runtime/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native + + + + + + + + + diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props index 5032b57ce81ffa..1e1b456aae1560 100644 --- a/src/installer/Directory.Build.props +++ b/src/installer/Directory.Build.props @@ -402,7 +402,7 @@ lib - .so + .so .dll .dylib diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets index b40cddb9dfd361..46319d4d1e34a6 100644 --- a/src/installer/pkg/projects/Directory.Build.targets +++ b/src/installer/pkg/projects/Directory.Build.targets @@ -336,4 +336,6 @@ - \ No newline at end of file + + + diff --git a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets index 33d863469cb4ea..a4635909bd3e1e 100644 --- a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets +++ b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets @@ -1,57 +1,5 @@ - - - - - - $([MSBuild]::NormalizeDirectory('$(CoreCLROverridePath)')) - - - x64 - x86 - x64 - $([MSBuild]::NormalizeDirectory('$(CoreCLROverridePath)','sharedFramework')) - $([MSBuild]::NormalizeDirectory('$(CoreCLROverridePath)','$(CoreCLRCrossTargetComponentDir)','sharedFramework')) - - - - - - - true - - - - - - - - runtime/$(RuntimeIdentifier)/native - - - - runtime/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native - - - - - - - - - - - + @@ -60,7 +8,7 @@ $(CoreFXOverridePath)/specs/$(MicrosoftPrivateCoreFxNETCoreAppPackage).nuspec $(CoreFXOverridePath)/specs/runtime.$(PackageRID).$(MicrosoftPrivateCoreFxNETCoreAppPackage).nuspec - + @@ -79,7 +27,7 @@ XmlInputPath="$(CoreFXSharedFrameworkImplementationPackageSpec)"> - + @@ -121,14 +69,71 @@ - - - <_runtimeDirectory>$(CoreCLROverridePath) - <_crossgenPath>$(CoreCLROverridePath)/crossgen$(ApplicationFileExtension) - <_CoreLibSharedDirectory>$(CoreCLROverridePath) - <_jitPath>$(CoreClrOverridePath)/$(_crossHostArch)/$(LibraryFilePrefix)clrjit$(LibraryFileExtension) + + + + <_runtimeCLR Include="$(_runtimePackageDir)**/$(LibraryFilePrefix)coreclr$(LibraryFileExtension)" /> + <_runtimeCoreLib Include="$(_runtimePackageDir)**/native/System.Private.CoreLib.dll" /> + <_fxSystemRuntime Include="$(_corefxPackageDir)**/System.Runtime.dll" /> + <_windowsWinMD Include="$(_winmdPackageDir)**/Windows.winmd" /> + <_diaSymReaderAssembly Include="$(_diaSymReaderPackageDir)**\Microsoft.DiaSymReader.Native.*.dll" /> + + + + <_runtimeDirectory>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework')) + <_crossGenPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', 'crossgen$(ApplicationFileExtension)')) - + + <_coreLibDirectory>$(CoreCLRArtifactsPath) + + + + <_jitPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', '$(LibraryFilePrefix)clrjit$(LibraryFileExtension)')) + + + <_fxLibDirectory>%(_fxSystemRuntime.RootDir)%(_fxSystemRuntime.Directory) + + + + <_windowsWinMDDirectory>%(_windowsWinMD.RootDir)%(_windowsWinMD.Directory) + + + + <_diaSymReaderToolDir>%(_diaSymReaderAssembly.RootDir)%(_diaSymReaderAssembly.Directory) + + + + + <_diaSymReaderToolDir>$(IntermediateOutputPath) + + + + + + + + + <_crossgenPlatformDirectories Include="%(_filesToCrossGen.RootDir)%(_filesToCrossGen.Directory)" /> + + <_crossgenPlatformDirectories Include="$(_runtimeDirectory)" /> + + <_crossgenPlatformDirectories Include="$(_coreLibDirectory)" /> + + + + + <_pathSeparatorEscaped>$([MSBuild]::Escape($([System.IO.Path]::PathSeparator.ToString()))) + <_crossgenPlatformAssemblies>@(_crossgenPlatformDirectories->'%(Identity)', '$(_pathSeparatorEscaped)') + + diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj index 91ea562a339c7c..3b8806b39d8749 100644 --- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj +++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj @@ -1,12 +1,13 @@ - - + + Microsoft.NETCore.App + true + false - @@ -31,53 +32,8 @@ Condition="'$(PackageTargetRuntime)' != ''" DependsOnTargets="GetCorePackagePaths" /> - - - <_coreFxVersionFile - Include="$(NuGetPackageRoot)$([System.String]::new('%(Reference.NuGetPackageId)').ToLowerInvariant())/%(Reference.NuGetPackageVersion)/version.txt" - Condition="$([System.String]::new('%(Reference.Identity)').ToLowerInvariant().Contains('system.runtime.dll'))" - Name="corefx" /> - <_coreClrVersionFile - Include="$(_runtimePackageDir)version.txt" - Name="coreclr" /> - - - - - - - - + - - - - <_ToolsToPackage Include="$(_runtimePackageDir)tools/**/*.*"/> - - $(_runtimePackageId) - - $([System.String]::new('tools/%(RecursiveDir)').TrimEnd('/')) - true - - - runtimes$(_crossDir)/native - true - - - - + diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 33381d49d0b558..5d547ddd104892 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -90,7 +90,7 @@ - + true @@ -156,6 +156,7 @@ <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(ArchGroup) $(_packageRID) $(RuntimeOS)-$(ArchGroup) + $(ArchGroup) @@ -169,6 +170,7 @@ true true + true - + false $(NoWarn);nullable - + diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj index 1e01986e867155..bfb6ca5c83239b 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj @@ -5,6 +5,8 @@ $(ToolRuntimeRID) $(NoWarn);NU1603;NU1605 true + true + $(ConfigurationGroup) @@ -13,14 +15,11 @@ - 3.0.0-rc2.19462.14 4.6.0-rc2.19462.14 - - @@ -44,7 +43,7 @@ hostfxr libhostfxr - + true false @@ -75,39 +74,20 @@ - - - $(CoreCLROverridePath)/PDB - - - - - + + - + - + - <_CoreLibFile Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'System.Private.CoreLib'" /> - - - <_CoreLibFilePath>%(_CoreLibFile.FullPath) - <_CoreLibPackagePath>$(_CoreLibFilePath.SubString(0, $(_CoreLibFilePath.IndexOf('runtimes')))) - - - - - - - - + @@ -122,5 +102,5 @@ - + From 88f21a920395f8e9b5b5bc48f229c2d6f2c14559 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 14 Nov 2019 18:08:32 -0800 Subject: [PATCH 02/29] Installer uses a live libraries build for DLLs. --- eng/liveBuilds.targets | 37 ++++++++-- .../src/localnetcoreapp.override.targets | 70 ------------------- .../netcoreapp/src/netcoreapp.depproj | 24 ++++++- src/libraries/Directory.Build.targets | 6 +- 4 files changed, 56 insertions(+), 81 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index cb128489a28ce4..864cdf5d321b9c 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -3,7 +3,13 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) $(Configuration) + $(Configuration) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr', 'bin', 'Product', '$(OSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(LibrariesConfiguration)')) + + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) + x64 x86 x64 @@ -40,18 +46,35 @@ $(CoreCLRCrossTargetComponentDir)PDB/*.dbg; $(CoreCLRCrossTargetComponentDir)PDB/*.dwarf" /> - - runtime/$(RuntimeIdentifier)/native - - runtime/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native + - - + + + + + + + + + + + - + + diff --git a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets index a4635909bd3e1e..0e6ae6b8c293fc 100644 --- a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets +++ b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets @@ -1,74 +1,4 @@ - - - - - - - $(CoreFXOverridePath)/specs/$(MicrosoftPrivateCoreFxNETCoreAppPackage).nuspec - $(CoreFXOverridePath)/specs/runtime.$(PackageRID).$(MicrosoftPrivateCoreFxNETCoreAppPackage).nuspec - - - - - - - - - - - - - - - - - - - - - @(CoreFXReferenceItems) - - - - - - - @(CoreFXReferenceCopyLocalItems) - - - - true - - - - - - - - <_coreFXOverrideDocFiles - Condition="'$(CoreFXOverridePath)' != '' And '%(NuGetPackageId)' == '$(MicrosoftPrivateCoreFxNETCoreAppPackage)'" - Include="@(OverriddenFrameworkReferenceFiles->'$(CoreFXOverridePath)/../../bin/docs/%(FileName).xml')" /> - <_docFilesToPackage Include="@(_coreFXOverrideDocFiles)" Condition="Exists('%(Identity)')" /> - - - diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj index 3b8806b39d8749..8e8506513bf4ea 100644 --- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj +++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj @@ -7,7 +7,6 @@ - @@ -34,6 +33,29 @@ + + + + runtime/$(PackageRID)/native + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 26eb539d668a35..7a51a358386d9b 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -7,7 +7,7 @@ - + @@ -74,8 +74,8 @@ $(NETCoreAppPackageRefPath) $(NETCoreAppPackageRuntimePath) - $(NETCoreAppPackageRuntimePath)\..\runtime - $(RefRootPath)microsoft.netcore.app + $(ArtifactsBinDir)pkg\netcoreapp\runtime\$(ConfigurationGroup) + $(RefRootPath)microsoft.netcore.app\$(ConfigurationGroup) ILLinkTrimAssembly=true From 6164fa8631ec9f8dfb514074b3dea6d4c7d9a527 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 14 Nov 2019 18:17:34 -0800 Subject: [PATCH 03/29] Remove newline in path. --- eng/liveBuilds.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 864cdf5d321b9c..4b0a6053c8c9ed 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -8,8 +8,7 @@ $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(LibrariesConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) - + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) x64 x86 x64 From 94a436be59e7bbf4bf2820f46b20516e2aa23bce Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sun, 17 Nov 2019 12:01:25 -0800 Subject: [PATCH 04/29] Enable live-live builds to build required live dependencies when the dependencies are in the building subset/subset category. --- Directory.Build.props | 10 +++++++ eng/Subsets.props | 14 +++++++--- eng/liveBuilds.targets | 43 +++++++++++++++++++++++++---- src/coreclr/coreclr.proj | 4 +-- src/installer/Directory.Build.props | 6 ---- 5 files changed, 60 insertions(+), 17 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index c9024609663cbd..ade0ea1a8d1199 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,6 +10,10 @@ --> + + true + + @@ -34,6 +38,12 @@ $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src')) + + + + + true + + - + libraries-installer-coreclr @@ -71,7 +75,7 @@ - + @@ -93,12 +97,14 @@ - + + - + + diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 4b0a6053c8c9ed..67a8a53a99d84b 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -4,18 +4,34 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) $(Configuration) $(Configuration) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr', 'bin', 'Product', '$(OSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(LibrariesConfiguration)')) - - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr', 'bin', 'Product', '$(OSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(LibrariesConfiguration)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) + $(CoreCLRArtifactsPathInTree) + $(LibrariesRefArtifactsPathInTree) + $(LibrariesBinArtifactsPathInTree) + $(LibrariesNativeArtifactsPathInTree) x64 x86 x64 + + true + + + + + $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)')) @@ -54,6 +70,23 @@ + + true + true + true + + + + + diff --git a/src/coreclr/coreclr.proj b/src/coreclr/coreclr.proj index efdb3a58e65e8e..2b38d0368b3e5e 100644 --- a/src/coreclr/coreclr.proj +++ b/src/coreclr/coreclr.proj @@ -5,10 +5,10 @@ <_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows))" Include="-skiptests" /> - <_CoreClrBuildArg Include="-$(Platform)" /> + <_CoreClrBuildArg Include="-$(TargetArchitecture)" /> <_CoreClrBuildArg Include="-$(Configuration.ToLower())" /> <_CoreClrBuildArg Condition="'$(ContinuousIntegrationBuild)' == 'true'" Include="-ci" /> - <_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows)) and ('$(Platform)' == 'x86' or '$(Platform)' == 'x64') and '$(Configuration)' == 'Release'" Include="-enforcepgo" /> + <_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows)) and ('$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'x64') and '$(Configuration)' == 'Release'" Include="-enforcepgo" /> <_CoreClrBuildArg Condition="'$(Configuration)' == 'Release'" Include="-stripsymbols" /> <_CoreClrBuildArg Condition="'$(OfficialBuildId)' == ''" Include="-officialbuildid=$(OfficialBuildId)" /> diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props index 1e1b456aae1560..4cef6c389875e0 100644 --- a/src/installer/Directory.Build.props +++ b/src/installer/Directory.Build.props @@ -16,12 +16,6 @@ --> - - - ILLinkTrimAssembly=true From 39ab7ffa5a3f1b38d4680e8072da7a5a5b05cc78 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 18 Nov 2019 12:04:25 -0800 Subject: [PATCH 09/29] Fix typo in coreclr/tests/src/Common/Directory.Build.targets. --- .../tests/src/Common/Directory.Build.targets | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/coreclr/tests/src/Common/Directory.Build.targets b/src/coreclr/tests/src/Common/Directory.Build.targets index b613ab63368d3d..e589c1e48323af 100644 --- a/src/coreclr/tests/src/Common/Directory.Build.targets +++ b/src/coreclr/tests/src/Common/Directory.Build.targets @@ -11,20 +11,20 @@ DependsOnTargets="ResolveAssemblyReferences"> - - - - + + + + %(Identity) - - - + + + Date: Mon, 18 Nov 2019 12:07:33 -0800 Subject: [PATCH 10/29] Restore CoreFX shared framework from live build for CoreCLR test dependencies. --- .../test_dependencies/test_dependencies.csproj | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj index af83abd53df7b5..0ea0e7a27fc9e1 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -7,10 +7,12 @@ true true win-arm;win-arm64;win-x64;win-x86;$(TargetRid) + $(BuildArch) + $(BuildOS) + false + false - - @@ -25,4 +27,11 @@ $(SourceDir)Common\test_dependencies\obj\project.assets.json + + + + + + + From c2b930c98c8c647b376c4a5fecd0956d3cc2129f Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 18 Nov 2019 13:36:32 -0800 Subject: [PATCH 11/29] Remove dependency on Microsoft.NETCore.CoreCLR.TestDependencies package. --- .../tests/src/Common/test_runtime/test_runtime.csproj | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj index dbf6db252a49d7..6b35e3498a32ac 100644 --- a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj +++ b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj @@ -12,12 +12,17 @@ - + + + + + + From f73ad73b1872a8739db84f8a36f07aaf6f8f1738 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 18 Nov 2019 14:00:15 -0800 Subject: [PATCH 12/29] Enable referencing live builds of the OOB libraries by temporarily adding a new BinplaceConfiguration. Update test_dependencies in the CoreCLR tree to use that to restore OOB libraries. --- eng/liveBuilds.targets | 20 +++++++++++++------ .../test_dependencies.csproj | 7 +------ src/libraries/Directory.Build.targets | 7 ++++++- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index f32369fb0aa241..e6db37b34638e2 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -6,11 +6,13 @@ $(Configuration) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(OSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'oob', 'runtime', '$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) $(CoreCLRArtifactsPathInTree) $(LibrariesRefArtifactsPathInTree) - $(LibrariesBinArtifactsPathInTree) + $(LibrariesSharedFrameworkBinArtifactsPathInTree) + $(LibrariesOOBBinArtifactsPathInTree) $(LibrariesNativeArtifactsPathInTree) x64 x86 @@ -72,7 +74,8 @@ true - true + true + true true @@ -88,13 +91,18 @@ - + + + - - - - - diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index f83f6e97f94be4..4795ac3ec2c438 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -70,7 +70,7 @@ $(BuildConfigurationRefPath) $(RuntimePath) - + $(NETCoreAppPackageRefPath) $(NETCoreAppPackageRuntimePath) @@ -80,6 +80,11 @@ ILLinkTrimAssembly=true + + + $(ArtifactsBinDir)pkg\oob\runtime\$(_bc_OSGroup)-$(ConfigurationGroup)-$(ArchGroup) + + $(NETCoreAppTestSharedFrameworkPath) From eb0e52211cc46eb574f7fd48b934c8ef3f045052 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 18 Nov 2019 14:23:32 -0800 Subject: [PATCH 13/29] Remove reference to System.Drawing.Common from NETClientPrimitives (the reference is only needed at runtime and Core_Root already has System.Drawing.Common). --- .../COM/NETClients/Primitives/NETClientPrimitives.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj index c8ac76c7ac1245..0c7d448ed4fe84 100644 --- a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj +++ b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj @@ -24,8 +24,5 @@ - - $(MicrosoftPrivateCoreFxNETCoreAppVersion) - From 68e746bc08b713de4bbfba62e91283f69d0d4535 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 18 Nov 2019 14:50:21 -0800 Subject: [PATCH 14/29] Remove package-based checked CoreCLR + CoreFX test runs. In the live-live world, we'll run this test configuration by pointing the CoreFX test host build step at the artifacts from a checked CoreCLR build (possible in both local and CI builds). --- eng/Versions.props | 2 - eng/helixcorefxtests.proj | 291 ------------------ src/coreclr/build-test.cmd | 33 +- src/coreclr/build-test.sh | 46 +-- src/coreclr/tests/build.proj | 1 - src/coreclr/tests/scripts/patch-corefx.py | 263 ---------------- .../tests/src/Common/CoreFX/CoreFX.csproj | 150 --------- src/coreclr/tests/src/dirs.proj | 5 +- src/coreclr/tests/src/runtest.proj | 14 - src/libraries/restore/runtime/runtime.depproj | 7 +- 10 files changed, 5 insertions(+), 807 deletions(-) delete mode 100644 eng/helixcorefxtests.proj delete mode 100644 src/coreclr/tests/scripts/patch-corefx.py delete mode 100644 src/coreclr/tests/src/Common/CoreFX/CoreFX.csproj diff --git a/eng/Versions.props b/eng/Versions.props index 90d24b7faa17f8..e9e666d65c6648 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,7 +53,6 @@ 5.0.0-alpha1.19563.3 5.0.0-alpha.1.19563.6 - 5.0.0-alpha.1.19562.8 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.6 @@ -106,7 +105,6 @@ optimization.linux-x64.ibc.corefx microsoft.private.intellisense Microsoft.DotNet.XUnitConsoleRunner - Microsoft.Private.CoreFx.NETCoreApp Microsoft.NETCore.Platforms Microsoft.NETCore.App optimization.IBC.CoreCLR diff --git a/eng/helixcorefxtests.proj b/eng/helixcorefxtests.proj deleted file mode 100644 index 7b14fb1d0ca70a..00000000000000 --- a/eng/helixcorefxtests.proj +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - - - - - - - - <_PropertiesToPass> - __BuildArch=$(__BuildArch); - __BuildOS=$(__BuildOS); - __BuildType=$(__BuildType); - Creator=$(_Creator); - HelixAccessToken=$(_HelixAccessToken); - HelixBuild=$(_HelixBuild); - HelixSource=$(_HelixSource); - HelixTargetQueues=$(_HelixTargetQueues); - HelixType=$(_HelixType); - PublishTestResults=$(_PublishTestResults); - RunCrossGen=$(_RunCrossGen); - TimeoutPerTestCollectionInMinutes=$(_TimeoutPerTestCollectionInMinutes) - - - - - - - - - <_Scenarios Include="$(_Scenarios.Split(','))" /> - - - <_ProjectsToBuild Include="$(MSBuildProjectFile)"> - $(_PropertiesToPass);Scenario=%(_Scenarios.Identity) - - - - - <_BuildInParallel>false - <_BuildInParallel Condition=" '@(_ProjectsToBuild->Count())' > '1' ">true - - - - - - - - - - $(_Creator) - $(_HelixAccessToken) - $(_HelixBuild) - $(_HelixSource) - $(_HelixTargetQueues) - $(_HelixType) - - - $(MSBuildThisFileDirectory)..\ - $(ProjectDir)artifacts\bin\coreclr - $(ProjectDir)artifacts\tests\coreclr\$(__BuildOS).$(__BuildArch).$(__BuildType)\ - true - - - $(ProjectDir)src\coreclr\tests\CoreFX\CoreFX.issues.rsp - - $(TestWorkingDir)testhost\ - $(TestWorkingDir)helix\ - - - shared\$(MicrosoftNETCoreAppPackage)\$(ProductVersion) - - https://dotnetfeed.blob.core.windows.net/dotnet-core - - - - - call RunTests.cmd -r %HELIX_CORRELATION_PAYLOAD% --rsp-file %HELIX_CORRELATION_PAYLOAD%\CoreFX.issues.rsp - ./RunTests.sh -r $HELIX_CORRELATION_PAYLOAD --rsp-file $HELIX_CORRELATION_PAYLOAD/CoreFX.issues.rsp - - - - - - - - - - - - SetStressModes_$(Scenario).cmd - SetStressModes_$(Scenario).sh - - - - - - - $(TestHostRootPath)$(TestEnvFileName) - - - - <_ProjectsToBuild Include="$(ProjectDir)src\coreclr\tests\testenvironment.proj"> - Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows) - - - - - - - - - - - - - - <_Scenario Include="$(Scenarios.Split(','))" /> - <_ProjectsToBuild Include="$(MSBuildProjectFile)"> - Scenario=%(_Scenario.Identity) - - - - - - - - - - - - - - <_TargetGroup>netcoreapp - <_AssetManifestPath>$(TestAssetBlobFeedUrl)/corefx-tests/$(MicrosoftPrivateCoreFxNETCoreAppVersion)/$(__BuildOS).$(__BuildArch)/$(_TargetGroup)/corefx-test-assets.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @(HelixPreCommand) - - - - $(__BuildArch) - - $(BuildType) - $(BuildType)-$(Scenario) - - CoreFX - $(TestRunNamePrefix)$(BuildOS) $(BuildArch) $(BuildType) @ - $(TestRunNamePrefix)$(BuildOS) $(BuildArch) $(BuildType) $(Scenario) @ - - - $(_PublishTestResults) - false - - true - true - true - true - - - - - - - - - - - - - - $(TestAssetBlobFeedUrl)/%(Identity) - $(HelixCommand) - $([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes))) - - - - - - - diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index f126181d88b681..532487b9792eda 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -237,7 +237,7 @@ if not exist "%VSINSTALLDIR%DIA SDK" goto NoDIA set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" call "%__SourceDir%\pal\tools\gen-buildsys.cmd" "%__ProjectFilesDir%" "%__NativeTestIntermediatesDir%" %__VSVersion% %__BuildArch% !__ExtraCmakeArgs! - + if not !errorlevel! == 0 ( echo %__ErrMsgPrefix%%__MsgPrefix%Error: failed to generate native component build project! exit /b 1 @@ -474,37 +474,6 @@ if errorlevel 1 ( xcopy /s /y /i "%CORE_ROOT_STAGE%" "%CORE_ROOT%" -REM ========================================================================================= -REM === -REM === Create the test host necessary for running CoreFX tests. -REM === The test host includes a dotnet executable, system libraries and CoreCLR assemblies found in CORE_ROOT. -REM === -REM ========================================================================================= - -echo %__MsgPrefix%Building CoreFX test host - -set __BuildLogRootName=Tests_CoreFX_Testhost -set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log -set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn -set __BuildErr=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.err -set __MsbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%" -set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%" -set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" -set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! - -powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng\common\msbuild.ps1" %__ArcadeScriptArgs%^ - %__ProjectDir%\tests\src\runtest.proj /t:CreateTestHost /nodeReuse:false^ - /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ - /p:UsePartialNGENOptimization=false /maxcpucount^ - !__Logging! %__CommonMSBuildArgs% %RuntimeIdArg% %__PriorityArg% %__UnprocessedBuildArgs% -if errorlevel 1 ( - echo %__ErrMsgPrefix%%__MsgPrefix%Error: Create Test Host failed. Refer to the build log files for details: - echo %__BuildLog% - echo %__BuildWrn% - echo %__BuildErr% - exit /b 1 -) - REM ========================================================================================= REM === REM === Create test wrappers. diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 3f0fc0634b5150..21af3fd3433960 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -132,16 +132,6 @@ generate_layout() fi } -patch_corefx_libraries() -{ - echo "${__MsgPrefix}Patching CORE_ROOT: '${CORE_ROOT}' with CoreFX libaries from enlistment '${__LocalCoreFXPath}" - - patchCoreFXArguments=("-clr_core_root" "${CORE_ROOT}" "-fx_root" "${__LocalCoreFXPath}" "-arch" "${__BuildArch}" "-build_type" "${__BuildType}") - scriptPath="$__ProjectDir/tests/scripts" - echo "python ${scriptPath}/patch-corefx.py ${patchCoreFXArguments[@]}" - $__Python "${scriptPath}/patch-corefx.py" "${patchCoreFXArguments[@]}" -} - precompile_coreroot_fx() { local overlayDir=$CORE_ROOT @@ -231,22 +221,6 @@ function is_skip_crossgen_test { return 1 } -generate_testhost() -{ - echo "${__MsgPrefix}Generating test host..." - - export TEST_HOST=$xUnitTestBinBase/testhost - - if [ -d "${TEST_HOST}" ]; then - rm -rf $TEST_HOST - fi - - mkdir -p $TEST_HOST - - build_MSBuild_projects "Tests_Generate_TestHost" "${__ProjectDir}/tests/src/runtest.proj" "Creating test host" "/t:CreateTestHost" -} - - build_Tests() { echo "${__MsgPrefix}Building Tests..." @@ -372,10 +346,6 @@ build_Tests() if [ $__SkipGenerateLayout != 1 ]; then generate_layout fi - - if [ ! -z "$__LocalCoreFXPath" ]; then - patch_corefx_libraries - fi } build_MSBuild_projects() @@ -574,10 +544,9 @@ usage_list=("-buildtestwrappersonly - only build the test wrappers.") usage_list+=("-copynativeonly: Only copy the native test binaries to the managed output. Do not build the native or managed tests.") usage_list+=("-crossgen - Precompiles the framework managed assemblies in coreroot.") usage_list+=("-generatelayoutonly - only pull down dependencies and build coreroot.") -usage_list+=("-generatetesthostonly - only pull down dependencies and build coreroot and the CoreFX testhost.") usage_list+=("-priority1 - include priority=1 tests in the build.") usage_list+=("-runtests - run tests after building them.") -usage_list+=("-skipgeneratelayout: Do not generate the Core_Root layout or the CoreFX testhost.") +usage_list+=("-skipgeneratelayout: Do not generate the Core_Root layout.") usage_list+=("-skiprestorepackages - skip package restore.") # Obtain the location of the bash script to figure out where the root of the repo is. @@ -630,16 +599,6 @@ handle_arguments() { __SkipGenerateLayout=1 ;; - localcorefxpath) - if [ -n "$2" ]; then - __LocalCoreFXPath="$2" - shift - else - echo "ERROR: 'localcorefxpath' requires a non-empty option argument" - exit 1 - fi - ;; - *) __UnprocessedBuildArgs+=("$1") ;; @@ -750,9 +709,6 @@ elif [ ! -z "$__BuildTestWrappersOnly" ]; then build_test_wrappers else generate_layout - if [ ! -z "$__GenerateTestHostOnly" ]; then - generate_testhost - fi fi if [ $? -ne 0 ]; then diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj index ee9112a60804f5..94194931c1d05a 100644 --- a/src/coreclr/tests/build.proj +++ b/src/coreclr/tests/build.proj @@ -24,7 +24,6 @@ - diff --git a/src/coreclr/tests/scripts/patch-corefx.py b/src/coreclr/tests/scripts/patch-corefx.py deleted file mode 100644 index bbc44c1af07737..00000000000000 --- a/src/coreclr/tests/scripts/patch-corefx.py +++ /dev/null @@ -1,263 +0,0 @@ -#!/usr/bin/env python3 -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. -# -########################################################################## -########################################################################## -# -# Module: patch-corefx.py -# -# Notes: -# -# Script to overwrite the nuget downloaded corefx libraries with ones -# built from a local enlistment. -# -########################################################################## -########################################################################## - -import argparse -import distutils.dir_util -import os -import re -import shutil -import subprocess -import sys - -########################################################################## -# Globals -########################################################################## - -testing = False - -# This should be factored out of build.sh -Unix_name_map = { - 'Linux': 'Linux', - 'Darwin': 'OSX', - 'FreeBSD': 'FreeBSD', - 'OpenBSD': 'OpenBSD', - 'NetBSD': 'NetBSD', - 'SunOS': 'SunOS' -} - -Is_windows = (os.name == 'nt') - -########################################################################## -# Delete protocol -########################################################################## - -def del_rw(action, name, exc): - os.chmod(name, 0o651) - os.remove(name) - -########################################################################## -# Argument Parser -########################################################################## - -description = 'Tool to patch CoreFx tests on the CoreCLR repo' - -parser = argparse.ArgumentParser(description=description) - -parser.add_argument('-arch', dest='arch', default='x64') -parser.add_argument('-build_type', dest='build_type', default='Debug') -parser.add_argument('-clr_core_root', dest='clr_core_root', default=None) -parser.add_argument('-fx_root', dest='fx_root', default=None) - - -########################################################################## -# Helper Functions -########################################################################## - -def validate_args(args): - """ Validate all of the arguments parsed. - Args: - args (argparser.ArgumentParser): Args parsed by the argument parser. - Returns: - (arch, build_type, clr_core_root, fx_root,) - (str, str, str, str) - Notes: - If the arguments are valid then return them all in a tuple. If not, raise - an exception stating x argument is incorrect. - """ - - arch = args.arch - build_type = args.build_type - clr_core_root = args.clr_core_root - fx_root = args.fx_root - - def validate_arg(arg, check): - """ Validate an individual arg - Args: - arg (str|bool): argument to be validated - check (lambda: x-> bool): test that returns either True or False - : based on whether the check passes. - - Returns: - is_valid (bool): Is the argument valid? - """ - - helper = lambda item: item is not None and check(item) - - if not helper(arg): - raise Exception('Argument: %s is not valid.' % (arg)) - - valid_archs = ['x86', 'x64', 'arm', 'arm64'] - valid_build_types = ['Debug', 'Checked', 'Release'] - - arch = next((a for a in valid_archs if a.lower() == arch.lower()), arch) - build_type = next((b for b in valid_build_types if b.lower() == build_type.lower()), build_type) - - validate_arg(arch, lambda item: item in valid_archs) - validate_arg(build_type, lambda item: item in valid_build_types) - - if clr_core_root is None: - raise Exception('No clr_core_root argument provided') - else: - clr_core_root = os.path.normpath(clr_core_root) - validate_arg(clr_core_root, lambda item: os.path.isdir(clr_core_root)) - - if fx_root is None: - raise Exception('No fx_root argument provided') - else: - fx_root = os.path.normpath(fx_root) - - args = (arch, build_type, clr_core_root, fx_root) - - log('Configuration:') - log(' arch: %s' % arch) - log(' build_type: %s' % build_type) - log(' clr_core_root: %s' % clr_core_root) - log(' fx_root: %s' % fx_root) - - return args - -def log(message): - """ Print logging information - Args: - message (str): message to be printed - """ - - print('[%s]: %s' % (sys.argv[0], message)) - -def test_log(message): - """ Print logging information only if testing mode is enabled - Args: - message (str): message to be printed - """ - if testing: - print('[%s]: %s' % (sys.argv[0], message)) - -def copy_files(source_dir, target_dir): - """ Copy any files in the source_dir to the target_dir. - The copy is not recursive. - The directories must already exist. - Args: - source_dir (str): source directory path - target_dir (str): target directory path - Returns: - Nothing - """ - - global testing - assert os.path.isdir(source_dir) - assert testing or os.path.isdir(target_dir) - - for source_filename in os.listdir(source_dir): - source_pathname = os.path.join(source_dir, source_filename) - if os.path.isfile(source_pathname): - target_pathname = os.path.join(target_dir, source_filename) - log('Copy: %s => %s' % (source_pathname, target_pathname)) - if not testing: - shutil.copy2(source_pathname, target_pathname) - -def patch_coreclr_root(core_root, fx_bin): - """ Walk through the fx bin and patch corefx dlls to the core root. - Args: - core_root (str): the core root path - fx_bin (str): the runtime folder from a corefx build - Returns: - nothing - """ - test_log('Patching coreclr core_root') - - forbidden_names = ['coreclr.dll', - 'system.private.corelib.dll', - 'r2rdump.dll', - 'runincontext.dll', - 'mscordaccore.dll', - 'linuxnonjit.dll', - 'protononjit.dll', - 'mscordbi.dll', - 'clrjit.dll', - 'dbgshim.dll', - 'coreshim.dll', - 'clrgc.dll', - 'superpmi-shim-counter.dll', - 'clretwrc.dll', - 'superpmi-shim-collector.dll', - 'superpmi-shim-simple.dll', - 'jitinterface.dll', - 'mscorrc.debug.dll', - 'mscorrc.dll', - 'sos.dll'] - - test_log('forbidden_names = %s' % forbidden_names) - - for file in os.listdir(fx_bin): - test_log('considering file %s' % file) - - filename = os.path.basename(file) - comparename = filename.lower() - if ( comparename.endswith('.dll') and - comparename not in forbidden_names and - not comparename.startswith('api-ms-core') ): - source_pathname = os.path.join(fx_bin, filename) - target_pathname = os.path.join(core_root, filename) - - test_log ('copying file %s to file %s' % (source_pathname, target_pathname)) - - shutil.copy2(source_pathname, target_pathname) - -########################################################################## -# Main -########################################################################## - -def main(args): - """ - The way this script decides what to patch is by looking at the core - root for a list of dlls, then filtering out any ones built by coreclr. - This leaves us with a list of non-coreclr build dlls. Now we can use - that list to go through the corefx repo and any ones that also exist - in the corefx bin folder are copied over. - """ - - log('Patching CoreFX binaries from local enlistment.') - - arch, build_type, clr_core_root, fx_root = validate_args(args) - - clr_os = 'Windows_NT' if Is_windows else Unix_name_map[os.uname()[0]] - - if not os.path.exists(clr_core_root): - raise Exception('Core root path %s does not exist.' % (core_root)) - - fx_bin = os.path.join(fx_root, - 'artifacts', - 'bin', - 'runtime', - 'netcoreapp-%s-%s-%s' % (clr_os, build_type, arch)) - - if not os.path.exists(fx_bin): - raise Exception('CoreFX bin path %s does not exist.' % (core_root)) - - patch_coreclr_root(clr_core_root, fx_bin) - - -########################################################################## -# setup for Main -########################################################################## - -if __name__ == '__main__': - Args = parser.parse_args(sys.argv[1:]) - - main(Args) diff --git a/src/coreclr/tests/src/Common/CoreFX/CoreFX.csproj b/src/coreclr/tests/src/Common/CoreFX/CoreFX.csproj deleted file mode 100644 index 36dccb97ada493..00000000000000 --- a/src/coreclr/tests/src/Common/CoreFX/CoreFX.csproj +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - $(SourceDir)Common\CoreFX\obj - C# - netcoreapp3.0 - SharedLibrary - false - 1.0.5 - Library - true - Microsoft.NETCore.App.deps.json - true - false - .NETCoreApp,Version=v3.0 - netcoreapp3.0 - true - $(MicrosoftNETCoreAppVersion) - - - - - win-$(Platform) - linux-$(Platform) - osx-$(Platform) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - hostfxr - dll - dotnet.exe - hostpolicy - dll - - - - libhostfxr - so - dylib - libhostpolicy - $(HostFxrFileExtension) - dotnet - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SourceDir)Common\CoreFX\obj\project.assets.json - - - - - - - - - - - diff --git a/src/coreclr/tests/src/dirs.proj b/src/coreclr/tests/src/dirs.proj index c545e1c16140ec..617f1328a32a46 100644 --- a/src/coreclr/tests/src/dirs.proj +++ b/src/coreclr/tests/src/dirs.proj @@ -8,7 +8,7 @@ - + @@ -18,7 +18,6 @@ - @@ -125,7 +124,7 @@ - + diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj index 60b711b12de38c..3dd4a20eb0be2b 100644 --- a/src/coreclr/tests/src/runtest.proj +++ b/src/coreclr/tests/src/runtest.proj @@ -376,16 +376,6 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). Properties="Language=C#;TargetRid=$(TargetRid);RuntimeIdentifier=$(TargetRid)" /> - - - - - - @@ -404,10 +394,6 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). Targets="CreateTestOverlay" Condition=" '$(GenerateRuntimeLayout)'=='true' "/> - - diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj index 6c6b60bdf7d791..81abb31afd858a 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj @@ -13,11 +13,6 @@ - - - 4.6.0-rc2.19462.14 - - @@ -30,7 +25,7 @@ - + From cba76e8394506928ad2d31159d44dcbbc07c48c7 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 18 Nov 2019 15:08:29 -0800 Subject: [PATCH 15/29] Only copy the UCRT on Windows. --- src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj index 6b35e3498a32ac..75eb52d392e7bf 100644 --- a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj +++ b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj @@ -17,7 +17,7 @@ - + From 3d3f216c753cf5a755a92cd71b573fb8350a90fd Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 19 Nov 2019 11:53:53 -0800 Subject: [PATCH 16/29] CoreCLR test build now builds against a live libraries sfx+oob ref assembly set. --- eng/liveBuilds.targets | 15 +++++--- .../test_dependencies.csproj | 1 - src/coreclr/tests/src/Directory.Build.targets | 34 +++++++++++++++---- src/libraries/Directory.Build.targets | 3 ++ 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index e6db37b34638e2..b2cb9a88edbb3d 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -5,12 +5,14 @@ $(Configuration) $(Configuration) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(OSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'oob', '$(LibrariesConfiguration)')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'oob', 'runtime', '$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) $(CoreCLRArtifactsPathInTree) - $(LibrariesRefArtifactsPathInTree) + $(LibrariesSharedFrameworkRefArtifactsPathInTree) + $(LibrariesOOBRefArtifactsPathInTree) $(LibrariesSharedFrameworkBinArtifactsPathInTree) $(LibrariesOOBBinArtifactsPathInTree) $(LibrariesNativeArtifactsPathInTree) @@ -73,7 +75,8 @@ - true + true + true true true true @@ -90,12 +93,14 @@ OSGroup=$(OSGroup)" /> - + + - + + true win-arm;win-arm64;win-x64;win-x86;$(TargetRid) $(BuildArch) - $(BuildOS) false false true diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets index 275d70b85fd767..e85c13f9dce8aa 100644 --- a/src/coreclr/tests/src/Directory.Build.targets +++ b/src/coreclr/tests/src/Directory.Build.targets @@ -44,8 +44,8 @@ - - + + <_CLRTestNeedsProjectToRun>false <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true @@ -80,10 +80,10 @@ <_CopyNativeProjectBinaries Condition="'$(_WillCLRTestProjectBuild)' != 'true'">false <_CopyNativeProjectBinaries Condition="'$(_CopyNativeProjectBinaries)' == ''">true - + - + @@ -105,7 +105,7 @@ - @@ -199,6 +199,12 @@ + + + + false @@ -207,6 +213,13 @@ + + + + + + - + true + + false + false + true + $(BuildArch) + + + + diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 4795ac3ec2c438..c61584d9fdda47 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -81,6 +81,9 @@ + + $(RefRootPath)oob\$(ConfigurationGroup) + $(ArtifactsBinDir)pkg\oob\runtime\$(_bc_OSGroup)-$(ConfigurationGroup)-$(ArchGroup) From 2f9d951d923ccbbecb2d02ff18e51bef16bc3eb0 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 19 Nov 2019 12:54:23 -0800 Subject: [PATCH 17/29] Override GetCorePackagePaths target to not reference unused packages (breaks the live-live build on a clean system). --- .../src/localnetcoreapp.override.targets | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets index 0e6ae6b8c293fc..5d86576c26425a 100644 --- a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets +++ b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets @@ -1,4 +1,36 @@ + + + + <_winmdPackageDir>$(NuGetPackageRoot)$(MicrosoftTargetingPackPrivateWinRTPackage.ToLowerInvariant())/$(MicrosoftTargetingPackPrivateWinRTVersion)/ + <_diaSymReaderPackageDir>$(NuGetPackageRoot)microsoft.diasymreader.native/$(MicrosoftDiaSymReaderNativeVersion)/ + + + + <_crossHostArch>x86 + + + <_crossHostArch>x64 + + + <_crossHostArch>x64 + + + <_crossDir Condition="'$(_crossHostArch)' != ''">/$(_crossHostArch)_$(TargetArchitecture) + + + + <_requiredProperty Include="_winmdPackageDir" /> + + + + + + + From 6601e93dea12fd48144f1fc99270b2b6a4ee6668 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 19 Nov 2019 13:06:03 -0800 Subject: [PATCH 18/29] Remove live references to Microsoft.NETCore.Platforms now that it seems to be unneeded since the SDK now packages a RID graph. Use the live RID graph in test_runtime.csproj where we may actually be looking for the live RID graph. --- eng/Tools.props | 5 +---- eng/Version.Details.xml | 4 ---- eng/liveBuilds.targets | 5 +++++ .../tests/src/Common/test_runtime/test_runtime.csproj | 2 +- .../pkg/projects/netcoreapp/src/netcoreapp.depproj | 7 +------ src/libraries/restore/runtime/runtime.depproj | 1 - 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/eng/Tools.props b/eng/Tools.props index a763640c26f89b..4d7d628472d50f 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -12,14 +12,11 @@ - + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79cc85afbad13c..b4cb56270892f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,5 @@ - - https://github.com/dotnet/corefx - 5cee7c97d602f294e27c582d4dab81ec388f1d7b - https://github.com/dotnet/corefx 5cee7c97d602f294e27c582d4dab81ec388f1d7b diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index b2cb9a88edbb3d..94638b6bf87193 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -122,4 +122,9 @@ + + + $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'pkg', 'Microsoft.NETCore.Platforms', 'runtime.json')) + $(LiveRuntimeIdentifierGraphPath) + diff --git a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj index 75eb52d392e7bf..abf800e5f2d4ec 100644 --- a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj +++ b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj @@ -9,9 +9,9 @@ $(NoWarn);NU1603 $(NoWarn);NU1701 true + true - diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj index 8e8506513bf4ea..e90d45ca36f979 100644 --- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj +++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj @@ -7,8 +7,6 @@ - - @@ -18,11 +16,8 @@ - + - - false diff --git a/src/coreclr/src/.nuget/packaging.props b/src/coreclr/src/.nuget/packaging.props index 6d16a9848935cd..69365bcd15d35b 100644 --- a/src/coreclr/src/.nuget/packaging.props +++ b/src/coreclr/src/.nuget/packaging.props @@ -6,7 +6,6 @@ $(CoreclrDir)/LICENSE.TXT $(CoreclrDir)/THIRD-PARTY-NOTICES.TXT - $(NuGetPackageRoot)/microsoft.netcore.platforms/$(MicrosoftNETCorePlatformsVersion)/runtime.json https://go.microsoft.com/fwlink/?LinkID=799421 https://dot.net diff --git a/src/installer/pkg/Directory.Build.targets b/src/installer/pkg/Directory.Build.targets index cbe076d1e7f617..d457972bfd7f5a 100644 --- a/src/installer/pkg/Directory.Build.targets +++ b/src/installer/pkg/Directory.Build.targets @@ -1,10 +1,6 @@ - - $(NuGetPackageRoot)$(PlatformPackageId.ToLowerInvariant())\$(MicrosoftNETCorePlatformsVersion)\runtime.json - - From 0344a538d6417879d2918085a5b088780c650e83 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 19 Nov 2019 14:21:26 -0800 Subject: [PATCH 21/29] Fix problems in installer build in live-live that were found from a clean build. --- .../netcoreapp/src/localnetcoreapp.override.targets | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets index 5d86576c26425a..d6fe8055204f31 100644 --- a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets +++ b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets @@ -35,9 +35,6 @@ DependsOnTargets="GetCorePackagePaths"> - <_runtimeCLR Include="$(_runtimePackageDir)**/$(LibraryFilePrefix)coreclr$(LibraryFileExtension)" /> - <_runtimeCoreLib Include="$(_runtimePackageDir)**/native/System.Private.CoreLib.dll" /> - <_fxSystemRuntime Include="$(_corefxPackageDir)**/System.Runtime.dll" /> <_windowsWinMD Include="$(_winmdPackageDir)**/Windows.winmd" /> <_diaSymReaderAssembly Include="$(_diaSymReaderPackageDir)**\Microsoft.DiaSymReader.Native.*.dll" /> @@ -47,18 +44,15 @@ <_crossGenPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', 'crossgen$(ApplicationFileExtension)')) - + <_coreLibDirectory>$(CoreCLRArtifactsPath) + <_fxLibDirectory>$(LibrariesSharedFrameworkBinArtifactsPath) <_jitPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', '$(LibraryFilePrefix)clrjit$(LibraryFileExtension)')) - - <_fxLibDirectory>%(_fxSystemRuntime.RootDir)%(_fxSystemRuntime.Directory) - - <_windowsWinMDDirectory>%(_windowsWinMD.RootDir)%(_windowsWinMD.Directory) @@ -89,6 +83,7 @@ <_crossgenPlatformDirectories Include="$(_runtimeDirectory)" /> <_crossgenPlatformDirectories Include="$(_coreLibDirectory)" /> + <_crossgenPlatformDirectories Include="$(_fxLibDirectory)" /> From 314c4a01c43dc5bcf524d2b767ef726550de42eb Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 19 Nov 2019 14:47:00 -0800 Subject: [PATCH 22/29] Remove unused dependency on Microsoft.NETCore.Targets. --- eng/Version.Details.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78a4ee731f135e..394f24ca525bca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,10 +4,6 @@ https://github.com/dotnet/corefx 5cee7c97d602f294e27c582d4dab81ec388f1d7b - - https://github.com/dotnet/corefx - 5cee7c97d602f294e27c582d4dab81ec388f1d7b - https://github.com/dotnet/corefx 5cee7c97d602f294e27c582d4dab81ec388f1d7b From f640bd9749452ee39b92e29b6256e6c25d997f8e Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 19 Nov 2019 14:57:35 -0800 Subject: [PATCH 23/29] Fix Microsoft.NETCore.App -> Microsoft.NETCore.Platforms dependency. --- .../netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj index 5a0d9501e728d9..d9d6f3423c3dda 100644 --- a/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj +++ b/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj @@ -20,7 +20,7 @@ - + From 80669fab32990a7bf1ed9941baac99e8930eed72 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 19 Nov 2019 14:58:27 -0800 Subject: [PATCH 24/29] Remove Microsoft.NETCore.Targets version from Versions.props. --- eng/Versions.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 381d8a0f3b9d2e..9191ebbf4a0d70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,7 +53,6 @@ 5.0.0-alpha1.19563.3 5.0.0-alpha.1.19563.6 - 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.3 From cea542d4a294650cb8ad72f00d9f3bfb8728d9b6 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 19 Nov 2019 15:11:57 -0800 Subject: [PATCH 25/29] Remove unused deps.csproj file that was the last dependency on the packaged Microsoft.NETCore.Platforms package. --- eng/Version.Details.xml | 4 ---- eng/Versions.props | 2 -- src/installer/pkg/deps/deps.csproj | 11 ----------- 3 files changed, 17 deletions(-) delete mode 100644 src/installer/pkg/deps/deps.csproj diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 394f24ca525bca..763bf68e758792 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,5 @@ - - https://github.com/dotnet/corefx - 5cee7c97d602f294e27c582d4dab81ec388f1d7b - https://github.com/dotnet/corefx 5cee7c97d602f294e27c582d4dab81ec388f1d7b diff --git a/eng/Versions.props b/eng/Versions.props index 9191ebbf4a0d70..dac7017e8d5532 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,6 @@ 5.0.0-alpha1.19563.3 5.0.0-alpha1.19563.3 - 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.3 @@ -104,7 +103,6 @@ optimization.linux-x64.ibc.corefx microsoft.private.intellisense Microsoft.DotNet.XUnitConsoleRunner - Microsoft.NETCore.Platforms Microsoft.NETCore.App optimization.IBC.CoreCLR optimization.PGO.CoreCLR diff --git a/src/installer/pkg/deps/deps.csproj b/src/installer/pkg/deps/deps.csproj deleted file mode 100644 index f105b8f3826f70..00000000000000 --- a/src/installer/pkg/deps/deps.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard1.0 - - - - - - - From 425d0347dd96b83c3bc839511c75c5c6403dc4d9 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 20 Nov 2019 09:28:57 -0800 Subject: [PATCH 26/29] Fix OSGroup calculation for dependent projects off-Windows. --- eng/liveBuilds.targets | 21 ++++++++++++------- .../netcoreapp/src/netcoreapp.depproj | 5 +++++ src/libraries/restore/runtime/runtime.depproj | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 1f9cde3b8e406a..b3b8688ca20019 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -2,14 +2,16 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) + $(OSGroup) $(Configuration) + $(OSGroup) $(Configuration) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(OSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(CoreCLROSGroup).$(TargetArchitecture).$(CoreCLRConfiguration)')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ref', 'oob', '$(LibrariesConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'oob', 'runtime', '$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(OSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'netcoreapp', 'runtime', '$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'pkg', 'oob', 'runtime', '$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'native', 'netcoreapp-$(LibrariesOSGroup)-$(LibrariesConfiguration)-$(TargetArchitecture)')) $(CoreCLRArtifactsPathInTree) $(LibrariesSharedFrameworkRefArtifactsPathInTree) $(LibrariesOOBRefArtifactsPathInTree) @@ -32,9 +34,10 @@ Targets="Build" BuildInParallel="true" Properties="Configuration=$(CoreCLRConfiguration); - TargetArchitecture=$(TargetArchitecture)" /> + TargetArchitecture=$(TargetArchitecture); + OSGroup=$(CoreCLROSGroup)" /> - + $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)')) @@ -58,7 +61,9 @@ $(CoreCLRSharedFrameworkDir)PDB/*.dbg; $(CoreCLRSharedFrameworkDir)PDB/*.dwarf" /> + Include="$(CoreCLRArtifactsPath)PDB/System.Private.CoreLib.pdb;" /> + + OSGroup=$(LibrariesOSGroup)" /> diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj index e90d45ca36f979..b06c97666f80cb 100644 --- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj +++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj @@ -4,6 +4,11 @@ Microsoft.NETCore.App true false + Windows_NT + Linux + OSX + FreeBSD + $(CoreCLROSGroup) diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj index d2d097ce362c2b..d6dcba5cafb16f 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj @@ -6,6 +6,7 @@ $(NoWarn);NU1603;NU1605 true true + $(DefaultOSGroup) $(ConfigurationGroup) From 364c6213eb008d596a1cc0189f7ce51ecadb5617 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 20 Nov 2019 15:22:45 -0800 Subject: [PATCH 27/29] Fix construction of Microsoft.NETCore.App.Internal package. --- .../pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj | 5 +++++ src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj index 8a92a5716b84c0..bea575e85c83ba 100644 --- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj +++ b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj @@ -18,5 +18,10 @@ false + + + + + diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj index b06c97666f80cb..ced5fb1500f081 100644 --- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj +++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj @@ -43,7 +43,7 @@ - + From 002e6640b63debdab2e7b5dbcaad140c97deda9e Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 21 Nov 2019 08:58:25 -0800 Subject: [PATCH 28/29] Remove unneeded CoreRun copying. --- src/libraries/restore/runtime/runtime.depproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj index d6dcba5cafb16f..1603fbf2374bd8 100644 --- a/src/libraries/restore/runtime/runtime.depproj +++ b/src/libraries/restore/runtime/runtime.depproj @@ -72,12 +72,8 @@ DependsOnTargets="ResolveCoreCLRFilesFromLocalBuild" AfterTargets="AfterResolveReferences;FilterNugetPackages"> - - - - From ad29f1be23af961839a524be3d8d31335c9799ad Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 22 Nov 2019 10:26:38 -0800 Subject: [PATCH 29/29] Remove optional consumption of CoreCLR transport packages in CoreCLR test build. --- src/coreclr/dependencies.props | 7 ---- src/coreclr/tests/Directory.Build.props | 27 ++++---------- src/coreclr/tests/build.proj | 2 -- src/coreclr/tests/publishdependency.targets | 12 ------- .../build_against_pkg_dependencies.csproj | 35 ------------------- .../targeting_pack_ref.csproj | 27 -------------- src/coreclr/tests/src/dirs.proj | 2 -- src/coreclr/tests/src/runtest.proj | 13 ------- 8 files changed, 7 insertions(+), 118 deletions(-) delete mode 100644 src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj delete mode 100644 src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props index ee1a80d71879e8..6336b791dc5801 100644 --- a/src/coreclr/dependencies.props +++ b/src/coreclr/dependencies.props @@ -7,7 +7,6 @@ - 3.0.0-preview6.19280.1 1.0.0-beta-build0015 2.0.43 1.0.4-preview6.19326.1 @@ -35,12 +34,6 @@ https://raw.githubusercontent.com/dotnet/versions - - - $(MSBuildThisFileFullPath) - MicrosoftNETCoreRuntimeCoreCLRPackageVersion - Microsoft.NETCore.Runtime.CoreCLR - diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index 77c129c9ccedcb..532dacb7e90403 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -10,7 +10,7 @@ true - + @@ -51,27 +51,14 @@ false - - $(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props - - - - - - - $(StableVersion) - $(PackageVersion)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor) - /p:MicrosoftNETCoreRuntimeCoreCLRPackageVersion=$(VersionToRestore) - - @@ -86,5 +73,5 @@ $([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'host', 'fxr', '$(TestHostVersion)')) $([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(TestHostVersion)')) - + diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj index 94194931c1d05a..091430dc951e0a 100644 --- a/src/coreclr/tests/build.proj +++ b/src/coreclr/tests/build.proj @@ -19,8 +19,6 @@ - - diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index b32770001c5206..6096501eb5a773 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -23,18 +23,6 @@ - - - - - - - - - - - - $(RootRepoDir)\artifacts\bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType) $(ProductDestination)\ref diff --git a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj deleted file mode 100644 index dcd564e19d8e79..00000000000000 --- a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Debug - AnyCPU - BuildOnly - false - - - - $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - - - $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - - - $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - - - $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - - - $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - - - - netcoreapp5.0 - .NETCoreApp - win-arm;win-arm64;win-x64;win-x86;$(TargetRid) - - - - diff --git a/src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj b/src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj deleted file mode 100644 index 3721bc537195d7..00000000000000 --- a/src/coreclr/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Debug - AnyCPU - BuildOnly - false - - - - $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - - - - netcoreapp1.1 - .NETCoreApp - win-arm;win-arm64;win-x64;win-x86;$(TargetRid) - - - - - - diff --git a/src/coreclr/tests/src/dirs.proj b/src/coreclr/tests/src/dirs.proj index 617f1328a32a46..b6dfdfa8f5f5d3 100644 --- a/src/coreclr/tests/src/dirs.proj +++ b/src/coreclr/tests/src/dirs.proj @@ -9,8 +9,6 @@ - - diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj index 3dd4a20eb0be2b..935a05c77e5f89 100644 --- a/src/coreclr/tests/src/runtest.proj +++ b/src/coreclr/tests/src/runtest.proj @@ -354,22 +354,9 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). - - - - - $(StableVersion) - $(PackageVersion)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor) - $(VersionToRestore) - - - - $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - -