Skip to content
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

Jump to bottom

Local Live live builds #55

Closed
wants to merge 34 commits into from
Closed

Local Live live builds #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 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
ad29f1b
Remove optional consumption of CoreCLR transport packages in CoreCLR …
jkoritzinsky Nov 22, 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
11 changes: 11 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
-->
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(SkipImportArcadeSdkFromRoot)' != 'true'" />

<PropertyGroup>
<RootDirectoryBuildPropsImported>true</RootDirectoryBuildPropsImported>
</PropertyGroup>

<!-- Common paths -->

<!-- Set these properties early enough for libraries as they import the Arcade SDK not early enough. -->
Expand Down Expand Up @@ -39,6 +43,12 @@
<CoreLibSharedDir>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))</CoreLibSharedDir>
</PropertyGroup>

<!--
Get ProjectToBuild and '<subset>ProjectToBuild' items. Using the items lets projects handle
$(Subset) automatically when creating project-to-project dependencies.
-->
<Import Condition="'$(SubsetsPropsImported)' != 'true'" Project="$(RepositoryEngineeringDir)Subsets.props" />

<!-- Packaging properties -->
<PropertyGroup>
<!--
Expand All @@ -49,6 +59,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>
</PropertyGroup>

</Project>
5 changes: 2 additions & 3 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project>

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

</Project>
</Project>
14 changes: 10 additions & 4 deletions eng/Subsets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,12 @@
artifacts to the test layout, then running the test subset.
-->

<PropertyGroup>
<SubsetsPropsImported>true</SubsetsPropsImported>
</PropertyGroup>

<!-- Import only when imported by Arcade's Build.proj as we import Directory.Build.props ourselves. -->
<Import Project="$(RepoRoot)Directory.Build.props" Condition="'$(SkipImportArcadeSdkFromRoot)' == 'true'" />
<Import Project="$(RepoRoot)Directory.Build.props" Condition="'$(SkipImportArcadeSdkFromRoot)' == 'true' and '$(RootDirectoryBuildPropsImported)' != 'true'" />

<PropertyGroup>
<DefaultSubsetCategories>libraries-installer-coreclr</DefaultSubsetCategories>
Expand All @@ -71,7 +75,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 @@ -93,12 +97,14 @@

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

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

<!-- Installer sets -->
Expand Down
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 @@ -12,14 +12,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" />
</ItemGroup>
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 @@ -50,12 +50,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 @@ -107,8 +103,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