Skip to content

Local live-live builds #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 83 commits into from
Dec 13, 2019
Merged

Local live-live builds #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
9c85652
Convert libraries and installer to use a live CoreCLR.
jkoritzinsky Nov 14, 2019
88f21a9
Installer uses a live libraries build for DLLs.
jkoritzinsky Nov 15, 2019
6164fa8
Remove newline in path.
jkoritzinsky Nov 15, 2019
94a436b
Enable live-live builds to build required live dependencies when the …
jkoritzinsky Nov 17, 2019
3b57b00
Merge branch 'master' of https://github.com/dotnet/runtime into live-…
jkoritzinsky Nov 18, 2019
ae23413
Update path to coreclr output.
jkoritzinsky Nov 18, 2019
02f2afa
Fix typo in coreclr.proj.
jkoritzinsky Nov 18, 2019
42f2954
Remove last usage of CoreCLRPDBOverridePath.
jkoritzinsky Nov 18, 2019
106ea54
Update path of binplaced runtime to include OS and Arch.
jkoritzinsky Nov 18, 2019
39ab7ff
Fix typo in coreclr/tests/src/Common/Directory.Build.targets.
jkoritzinsky Nov 18, 2019
23f8963
Restore CoreFX shared framework from live build for CoreCLR test depe…
jkoritzinsky Nov 18, 2019
c2b930c
Remove dependency on Microsoft.NETCore.CoreCLR.TestDependencies package.
jkoritzinsky Nov 18, 2019
f73ad73
Enable referencing live builds of the OOB libraries by temporarily ad…
jkoritzinsky Nov 18, 2019
eb0e522
Remove reference to System.Drawing.Common from NETClientPrimitives (t…
jkoritzinsky Nov 18, 2019
68e746b
Remove package-based checked CoreCLR + CoreFX test runs. In the live-…
jkoritzinsky Nov 18, 2019
cba76e8
Only copy the UCRT on Windows.
jkoritzinsky Nov 18, 2019
3d3f216
CoreCLR test build now builds against a live libraries sfx+oob ref as…
jkoritzinsky Nov 19, 2019
2f9d951
Override GetCorePackagePaths target to not reference unused packages …
jkoritzinsky Nov 19, 2019
6601e93
Remove live references to Microsoft.NETCore.Platforms now that it see…
jkoritzinsky Nov 19, 2019
48c45f0
Merge branch 'master' of https://github.com/dotnet/runtime into live-…
jkoritzinsky Nov 19, 2019
9f35f9d
Fix coreclr build arg generation bug that was causing build failures.
jkoritzinsky Nov 19, 2019
8b4791d
Remove references to Microsoft.NETCore.Platforms outside of package r…
jkoritzinsky Nov 19, 2019
0344a53
Fix problems in installer build in live-live that were found from a c…
jkoritzinsky Nov 19, 2019
aa4b349
Merge branch 'master' into live-live-builds
jkoritzinsky Nov 19, 2019
314c4a0
Remove unused dependency on Microsoft.NETCore.Targets.
jkoritzinsky Nov 19, 2019
f640bd9
Fix Microsoft.NETCore.App -> Microsoft.NETCore.Platforms dependency.
jkoritzinsky Nov 19, 2019
80669fa
Remove Microsoft.NETCore.Targets version from Versions.props.
jkoritzinsky Nov 19, 2019
cea542d
Remove unused deps.csproj file that was the last dependency on the pa…
jkoritzinsky Nov 19, 2019
01f5130
Merge branch 'live-live-builds' of https://github.com/jkoritzinsky/ru…
jkoritzinsky Nov 19, 2019
425d034
Fix OSGroup calculation for dependent projects off-Windows.
jkoritzinsky Nov 20, 2019
364c621
Fix construction of Microsoft.NETCore.App.Internal package.
jkoritzinsky Nov 20, 2019
002e664
Remove unneeded CoreRun copying.
jkoritzinsky Nov 21, 2019
2956eef
Merge branch 'master' of https://github.com/dotnet/runtime into live-…
jkoritzinsky Nov 21, 2019
b6998d3
Merge branch 'master' of https://github.com/dotnet/runtime into live-…
jkoritzinsky Dec 3, 2019
e510223
Serialize subsets that have dependencies across subset groups. Don't …
jkoritzinsky Dec 3, 2019
5e03d58
Cleanup from PR feedback.
jkoritzinsky Dec 3, 2019
48aac61
Merge branch 'master' of https://github.com/dotnet/runtime into live-…
jkoritzinsky Dec 3, 2019
dc3916f
Only copy libraries outputs to artifacts/bin/runtime.
jkoritzinsky Dec 4, 2019
605322d
Use the netcoreapp output directories for OOB-included references to …
jkoritzinsky Dec 4, 2019
85e5f6b
Remove references to deleted old corefx override setup.
jkoritzinsky Dec 4, 2019
8ee14f5
First pass to get new runtime pipeline using the local live-live infr…
jkoritzinsky Dec 4, 2019
dfa1ec6
Don't generate layout during test native build.
jkoritzinsky Dec 4, 2019
e70bbc8
Fix ref assembly default binplacing for netcoreapp.
jkoritzinsky Dec 4, 2019
374d270
Remove msbuild goo around importing Subsets.props and Directory.Build…
jkoritzinsky Dec 4, 2019
14c9ea7
Fix disabling of binplacing for the target vertical to exclude only r…
jkoritzinsky Dec 4, 2019
c531373
Fix libraries test build.
jkoritzinsky Dec 5, 2019
6269367
Copy all paths used by the "ResolveLibrariesFromLocalBuild" target to…
jkoritzinsky Dec 5, 2019
beea44d
Merge branch 'master' of https://github.com/dotnet/runtime into live-…
jkoritzinsky Dec 5, 2019
b9fe7cc
For shims, reference the System.Private.CoreLib directly from CoreCLR…
jkoritzinsky Dec 5, 2019
d361731
Hard-code the libraries configuration to release in coreclr test builds.
jkoritzinsky Dec 5, 2019
6041f29
Resolve ReferenceFromRuntime items directly from the CoreCLR output i…
jkoritzinsky Dec 6, 2019
a8e5503
Fix test host generation. Fix running the XML Serialization generator…
jkoritzinsky Dec 6, 2019
b2f55db
Fix XmlSerializer.Generator.Tests again.
jkoritzinsky Dec 6, 2019
0a0ee37
Don't look for CoreCLR files when using ReferenceFromRuntime and not …
jkoritzinsky Dec 6, 2019
da309ce
Merge branch 'master' of https://github.com/dotnet/runtime into live-…
jkoritzinsky Dec 6, 2019
3012c84
Crossgen-comparison should depend on a libraries build so we can popu…
jkoritzinsky Dec 6, 2019
6f66668
Add job dependency on libraries build from run-test-job to ensure we …
jkoritzinsky Dec 6, 2019
a19f898
Only resolve coreclr files from local build when targetting netcoreapp.
jkoritzinsky Dec 7, 2019
4d1af1e
Add steps to download libraries build for crossgen-comparison.
jkoritzinsky Dec 7, 2019
7b46f81
Revive old method of resolving references to the runtime for building…
jkoritzinsky Dec 7, 2019
c983f5e
Fix failing AllConfigurations leg that was due to the netcoreapp runt…
jkoritzinsky Dec 9, 2019
613e369
Update eng/liveBuilds.targets
jkoritzinsky Dec 9, 2019
27e3404
HostArch->BuildArchitecture and share with installer.
jkoritzinsky Dec 9, 2019
664f150
Merge branch 'live-live-builds' of https://github.com/jkoritzinsky/ru…
jkoritzinsky Dec 9, 2019
f53a06e
Merge branch 'master' of https://github.com/dotnet/runtime into live-…
jkoritzinsky Dec 9, 2019
8bbdc41
Fix format nits.
jkoritzinsky Dec 9, 2019
a63b863
Update YAML variable name.
jkoritzinsky Dec 9, 2019
7788dbe
Remove setting property to import liveBuilds.targets.
jkoritzinsky Dec 9, 2019
f8ab227
Merge branch 'master' of https://github.com/dotnet/runtime into live-…
jkoritzinsky Dec 11, 2019
b37d754
Upload docs and packages folders from libraries build
jkoritzinsky Dec 11, 2019
3cbbb3e
Inclue doc files in the Microsoft.NETCore.App.Internal package
jkoritzinsky Dec 11, 2019
d307095
Try making the runtime-installer pipeline live-live using the build-c…
jkoritzinsky Dec 11, 2019
fbdde3e
Update artifacts download paths and msbuild properties for installer …
jkoritzinsky Dec 11, 2019
60ecad1
Mark cross-component files as native.
jkoritzinsky Dec 11, 2019
9ae4d08
Remove FrameworkPackageName to remove error about missing $(Framewor…
jkoritzinsky Dec 11, 2019
cd636c8
Restore GetFilesFromPackageResolve override.
jkoritzinsky Dec 11, 2019
77f3ec7
Don't clean the unpack folder for the libraries download. It wipes ou…
jkoritzinsky Dec 11, 2019
7257b1e
Make sure that we restore the WinRT targetting pack during the instal…
jkoritzinsky Dec 12, 2019
cdf9a29
Add libraries package directory to RestoreSources for the case where …
jkoritzinsky Dec 12, 2019
9b62aff
Don't pass OfficialBuildId unless it is an official build. We want to…
jkoritzinsky Dec 12, 2019
35bfb81
Give default value for OfficialBuildArg variable
jkoritzinsky Dec 12, 2019
ef5144c
Ensure installer tests can see the libraries-generated packages. Fix …
jkoritzinsky Dec 12, 2019
836c9b7
Add back FrameworkPackageName to get the partial platform manifest to…
jkoritzinsky Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
<RepositoryUrl>git://github.com/dotnet/runtime</RepositoryUrl>
<ProjectUrl>https://github.com/dotnet/runtime</ProjectUrl>
<LicenseUrl>https://github.com/dotnet/runtime/blob/master/LICENSE.TXT</LicenseUrl>
<RuntimeIdGraphDefinitionFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'pkg', 'Microsoft.NETCore.Platforms', 'runtime.json'))</RuntimeIdGraphDefinitionFile>
<LicenseFile>$(RepoRoot)LICENSE.TXT</LicenseFile>

<!-- Indicates this is not an officially supported release. Release branches should set this to false. -->
Expand Down Expand Up @@ -89,6 +90,8 @@
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
<!-- Used for launchSettings.json and runtime config files. -->
<AppDesignerFolder>Properties</AppDesignerFolder>
<!-- Determine what architecture we are building on. -->
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
Copy link
Member

@safern safern Dec 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this dictates what architecture the product targets when building? Or can the target arch be overridden via an argument?

Copy link
Member Author

@jkoritzinsky jkoritzinsky Dec 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the architecture the build process is running on, separate from the target architecture.

</PropertyGroup>

<Import Project="$(RepositoryEngineeringDir)Analyzers.props" />
Expand Down
3 changes: 2 additions & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
</PropertyGroup>

<Import Project="$(RepositoryEngineeringDir)/liveBuilds.targets" />
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(SkipImportArcadeSdkFromRoot)' != 'true'" />

<PropertyGroup>
Expand All @@ -18,4 +19,4 @@
<NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
</PropertyGroup>

</Project>
</Project>
28 changes: 15 additions & 13 deletions eng/Subsets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@

<!-- Libraries -->
<SubsetName Include="All" Category="Libraries" Description="The .NET libraries comprising the shared framework." />

<!-- CoreClr -->
<SubsetName Include="All" Category="CoreClr" Description="The .NET runtime." />

Expand All @@ -96,14 +96,16 @@
<ProjectToBuild Include="$(RepoToolsLocalDir)regenerate-readme-table.proj" />
</ItemGroup>

<!-- Libraries sets -->
<ItemGroup Condition="$(_subsetCategory.Contains('libraries')) and $(_subset.Contains('all'))">
<ProjectToBuild Include="$(LibrariesProjectRoot)build.proj" />
</ItemGroup>

<!-- CoreClr sets -->
<ItemGroup Condition="$(_subsetCategory.Contains('coreclr')) and $(_subset.Contains('all'))">
<ProjectToBuild Include="$(CoreClrProjectRoot)coreclr.proj" />
<CoreClrProjectToBuild Include="$(CoreClrProjectRoot)coreclr.proj" BuildInParallel="false" />
<ProjectToBuild Include="@(CoreClrProjectToBuild)" />
</ItemGroup>

<!-- Libraries sets -->
<ItemGroup Condition="$(_subsetCategory.Contains('libraries')) and $(_subset.Contains('all'))">
<LibrariesProjectToBuild Include="$(LibrariesProjectRoot)build.proj" BuildInParallel="false" />
<ProjectToBuild Include="@(LibrariesProjectToBuild)" />
</ItemGroup>

<!-- Installer sets -->
Expand All @@ -119,23 +121,23 @@
</ItemGroup>

<ItemGroup Condition="$(_subsetCategory.Contains('installer')) and $(_subset.Contains('depproj'))">
<DepprojProjectToBuild Include="$(InstallerProjectRoot)pkg\projects\**\*.depproj" SignPhase="Binaries" />
<DepprojProjectToBuild Include="$(InstallerProjectRoot)pkg\projects\**\*.depproj" SignPhase="Binaries" BuildInParallel="false" />
<ProjectToBuild Include="@(DepprojProjectToBuild)" />
</ItemGroup>

<ItemGroup Condition="$(_subsetCategory.Contains('installer')) and $(_subset.Contains('pkgproj'))">
<PkgprojProjectToBuild Include="$(InstallerProjectRoot)pkg\projects\**\*.pkgproj" SignPhase="MsiFiles" />
<PkgprojProjectToBuild Include="$(InstallerProjectRoot)pkg\projects\**\*.pkgproj" SignPhase="MsiFiles" BuildInParallel="false" />
<ProjectToBuild Include="@(PkgprojProjectToBuild)" />
</ItemGroup>

<ItemGroup Condition="$(_subsetCategory.Contains('installer')) and $(_subset.Contains('bundle'))">
<BundleProjectToBuild Include="$(InstallerProjectRoot)pkg\projects\**\*.bundleproj" SignPhase="BundleInstallerFiles" />
<BundleProjectToBuild Include="$(InstallerProjectRoot)pkg\projects\**\*.bundleproj" SignPhase="BundleInstallerFiles" BuildInParallel="false" />
<ProjectToBuild Include="@(BundleProjectToBuild)" />
</ItemGroup>

<ItemGroup Condition="$(_subsetCategory.Contains('installer')) and $(_subset.Contains('installers'))">
<InstallerProjectToBuild Include="$(InstallerProjectRoot)pkg\packaging\installers.proj" />
<InstallerProjectToBuild Include="$(InstallerProjectRoot)pkg\packaging\vs-insertion-packages.proj" />
<InstallerProjectToBuild Include="$(InstallerProjectRoot)pkg\packaging\installers.proj" BuildInParallel="false" />
<InstallerProjectToBuild Include="$(InstallerProjectRoot)pkg\packaging\vs-insertion-packages.proj" BuildInParallel="false" />
<ProjectToBuild Include="@(InstallerProjectToBuild)" />
</ItemGroup>

Expand All @@ -147,7 +149,7 @@
<TestProjectToBuild Include="$(InstallerProjectRoot)test\HostActivation.Tests\HostActivation.Tests.csproj" />
<TestProjectToBuild Include="$(InstallerProjectRoot)test\Microsoft.DotNet.CoreSetup.Packaging.Tests\Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj" />
<TestProjectToBuild Include="$(InstallerProjectRoot)test\Microsoft.Extensions.DependencyModel.Tests\Microsoft.Extensions.DependencyModel.Tests.csproj" />
<ProjectToBuild Include="@(TestProjectToBuild)" />
<ProjectToBuild Include="@(TestProjectToBuild)" BuildInParallel="false" />
</ItemGroup>

</Project>
5 changes: 1 addition & 4 deletions eng/Tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@
<!-- arcade -->
<PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" />
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />

<!-- coreclr -->
<!-- Download the package in the initial arcade restore step to work around race conditions when restoring an msbuild SDK. -->
<PackageDownload Include="Microsoft.NET.Sdk.IL" Version="[$(MicrosoftNETSdkILVersion)]" />

<!-- corefx -->
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />

<!-- roslyn -->
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />

Expand Down
12 changes: 0 additions & 12 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha.1.19563.6">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Targets" Version="5.0.0-alpha.1.19563.6">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="5.0.0-alpha.1.19563.6">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
Expand All @@ -28,10 +20,6 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>cf64918877d98577363bb40d5eafac52beb80a79</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="5.0.0-alpha1.19563.3">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>2c4fb3250989f014550882f5d165cdc36ebdbd08</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-alpha1.19563.3">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>2c4fb3250989f014550882f5d165cdc36ebdbd08</Sha>
Expand Down
6 changes: 0 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,8 @@
<MicrosoftDotNetPlatformAbstractionsVersion>3.0.0</MicrosoftDotNetPlatformAbstractionsVersion>
<!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>5.0.0-alpha1.19563.3</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19563.3</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETSdkILVersion>5.0.0-alpha1.19563.3</MicrosoftNETSdkILVersion>
<!-- Libraries dependencies -->
<MicrosoftNETCorePlatformsVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCorePlatformsVersion>
<MicrosoftPrivateCoreFxNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftPrivateCoreFxNETCoreAppVersion>
<MicrosoftNETCoreTargetsVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreTargetsVersion>
<SystemTextJsonVersion>5.0.0-alpha.1.19563.6</SystemTextJsonVersion>
<SystemTextEncodingsWebVersion>5.0.0-alpha.1.19563.6</SystemTextEncodingsWebVersion>
<runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19563.3</runtimenativeSystemIOPortsVersion>
Expand Down Expand Up @@ -106,8 +102,6 @@
<LinuxCoreFxOptimizationDataPackage>optimization.linux-x64.ibc.corefx</LinuxCoreFxOptimizationDataPackage>
<MicrosoftPrivateIntellisensePackage>microsoft.private.intellisense</MicrosoftPrivateIntellisensePackage>
<MicrosoftDotNetXUnitConsoleRunnerPackage>Microsoft.DotNet.XUnitConsoleRunner</MicrosoftDotNetXUnitConsoleRunnerPackage>
<MicrosoftPrivateCoreFxNETCoreAppPackage>Microsoft.Private.CoreFx.NETCoreApp</MicrosoftPrivateCoreFxNETCoreAppPackage>
<MicrosoftNETCorePlatformsPackage>Microsoft.NETCore.Platforms</MicrosoftNETCorePlatformsPackage>
<MicrosoftNETCoreAppPackage>Microsoft.NETCore.App</MicrosoftNETCoreAppPackage>
<optimizationIBCCoreCLRPackage>optimization.IBC.CoreCLR</optimizationIBCCoreCLRPackage>
<optimizationPGOCoreCLRPackage>optimization.PGO.CoreCLR</optimizationPGOCoreCLRPackage>
Expand Down
Loading