Skip to content

Commit

Permalink
Core-Setup on Buildtools (dotnet/core-setup#2187)
Browse files Browse the repository at this point in the history 
* update .gitignore

* Add bootstrap for buildtools and run tool

* Add dev workflow commands clean/sync for Windows

* Update supported target rids and target archs

* Compile corehost via run.exe

* Add main build.proj

* Update config.json

* Enable PkgPackage prject using buildtools

* Fix path to version.txt

* Add dir.proj for src

* Move custom tasks to root leve

* build custom tasks

* build corehost using build.cmd

* Build src packages using build.cmd

* Add custom build option to run.exe config

* Add custom task - GetBuildableFramework

* add props header

* improve BuildProjectsForNuGetPackages

* Move deps clean to its own task

* Fix lockfile publishing

* Fix ExeSuffix prop

* Fix runtime Graph generation prop

* Enable tests through run.exe

* Enable packaging for win and mac

* custom tasks sln

* start fixing tests

* Fix test paths

* firx custom task

* Generate Svg badge from msbuild

* Move GenerateMsiVersion to its own custom task

* Generate stable Guids using custom task

* Make run.sh executable

* Add clean and sync scripts for *nix

* Fixes for unix

* Enable packaging for OSX

* Generate debs part 1

* Import deb packaging targets

* Fix osx packaging

* Fix typo

* Fix RuntimeGraph. removing lower casing

* Packages debs part 2

* Minor fixes for GenerateDebs

* Complete Generate Debs

* Update versions

* Add flag to control generating deb pkgs

* Pack dotnet-deb-tool

* First version for build.sh

* Update packaging

* Add packaging to full build

* Update dependencies

* move custom tasks under build/tasks

* P.R. comments part 1

* Add ReplaceFileContents task

* Use ReplaceFileContents task

* Update .gitignore

* Fix template for shared framework

* PR feedback

* move sign.proj to root

* Update sign.proj

* Update version

* Add missing file

* Fixing the --fallbacksource to be correct.

* Fix pkg build

* Add missing Msi ugrade code and fix namesfor existing

* Moving folders

* Refactor and update versioning

* publish finalizing

* publish finalization

* Intermediate change, fixing build after merge

* Merge fixes

* Enable partial testing build, and bringing back publishing which was lost

* Publishing

* Enable hostactivationtests

* actually add publishing targets

* update gitignore

* make Bin and Packages capitalized because they're external

* update readme.md with dnvm urls

* msi version change, test fixes

* Enable publish to nuget during publishing

* Add build.sh change

* Enable tests

* Add test failure summary

* Update microsoft.netcore.app platform version testing against

* Delete xml file which shouldn't be added

* Testing changes

* Test fixes

* Minor cleanup, auto-derive test target rid if it's not specified

* Cleanup before test run to prevent failures caused after successive reruns

* Remove versions junction which breaks testing since it picks the wrong
version

* Enable linux build

* Fix linux compression, avoid "file chaned as we read it" error

* Fix linux test builds

* Test changes for Linux

* Minor fixes for Windows

* Change nuget feed for validation

* use buildtools repo

* separate run into run and init

* Use corefx style docker builds

* Use build.sourcesdirectory

* chmod +x init.sh

* add pb_gitdirectory variable

* Use inittools instead of bootstrap

* Chmod +x init-tools.sh

* Update crossgen to be +x

* Fix casing looking for platforms package

* Fix buildtoolstaskdir

* set default localbuildtoolstaskdir

* set nuget_packages when running dotnet build for src/managed projects

* set absolute path for items

* Add missing docker-as-current-user.sh script

* chmod+x the docker run scripts

* print command for debugging

* remove uneccessary debugging echo

* print debugging message

* chmod+x init-tools.sh

* Add debugging messages

* fix typo

* Fix casing

* chmod+x boostrap.sh

* Update bootstrap script

* display debug message

* Fix typo

* temporarily add dotnet-install.sh script

* Relax min req for dotnet-obtain

* relax reqs in bootstrap

* make copy verbose to debug

* Fix typo

* add -p to mkdir in bootstrap

* Add another -p to mkdir in bootstrap

* try to fix exit code check

* bootstrap verbose

* Use wget as a fallback for distros without curl

* misc fixes

* make crossgen optional based on existence of script

* Add nuget default timeout

* Add default containername

* Remove verbose option from bootstrap call

* only publish corehost packages if finalization has completed

* Check in updated linux build def

* update docker tags

* pass distrorid for publishing

* Fix definition name

* Generate version assets

* buildpipeline changes, enabling windows

* Add target to build traversal build dependencies

* Add tools-override copy to init-tools

* Change roslyn version

* Fix building traversal build dependencies logic

* Create the version info file

* Add hook to opt out of including all runtime packages for testing purposes

* absolute paths to prevent build break when building a sub project from a
different working directory

* copy custom task dependency to local task directory

* Add platformabstractions to custom-task dependencies

* try adding back temp folder

* dotnet restore for tests requires nugetfallbackfolder be present

* set test rid with targetarchitecture

* Add windows builds

* hack the osx distrorid

* use packagetargetrid for sharedframework project

* Publish packagetargetrid

* Remove osx.10.12 from packagetargetrid change list

* Remove hack, not needed now that packagetargetrid is fixed

* Add osx

* misc build changes

* rename compression -> packaging, and some portable build changes

* misc merge changes

* Update dependency versions

* Enable portable linux build

* update to netci.groovy

* Remove -targets qualifier from netci.groovy

* run parses parameter/values with = separator

* set unrestricted execution policy when calling powershell

* move wix toolset extraction into msbuild so we don't have a dependency on
powershell v5.0+

* print slightly more debug info

* switch path separator char

* Custom zipfileextracttodirectory task

* Add references for compression task

* Don't delete destination directory

* remove branched zip extraction task

* tweak the groovy file to make testing easier

* change disable to disabled

* Change ci platform build list

* load sln's even if buildtools isn't restored

* Allow loading sln's even if buildtools not restored

* hack osx rid

* Fix typo


Commit migrated from dotnet/core-setup@6887ab5
  • Loading branch information
@chcosta
chcosta authored Apr 27, 2017
1 parent b42e212 commit 5cf63ea
Show file tree
Hide file tree
Showing 448 changed files with 8,399 additions and 6,154 deletions.
22 changes: 11 additions & 11 deletions Microsoft.DotNet.CoreSetup.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
NuGet.Config = NuGet.Config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setuptools", "setuptools", "{0722D325-24C8-4E83-B5AF-0A083E7F0749}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setuptools", "tools-local\setuptools", "{0722D325-24C8-4E83-B5AF-0A083E7F0749}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build_projects", "build_projects", "{88278B81-7649-45DC-8A6A-D3A645C5AFC3}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "src\build", "{88278B81-7649-45DC-8A6A-D3A645C5AFC3}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Cli.Build.Framework", "build_projects\Microsoft.DotNet.Cli.Build.Framework\Microsoft.DotNet.Cli.Build.Framework.xproj", "{49BEB486-AB5A-4416-91EA-8CD34ABB0C9D}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Cli.Build.Framework", "src\build\Microsoft.DotNet.Cli.Build.Framework\Microsoft.DotNet.Cli.Build.Framework.xproj", "{49BEB486-AB5A-4416-91EA-8CD34ABB0C9D}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "shared-build-targets-utils", "build_projects\shared-build-targets-utils\shared-build-targets-utils.xproj", "{B768BD29-12BF-4C7C-B093-03193FE244D1}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "shared-build-targets-utils", "src\build\shared-build-targets-utils\shared-build-targets-utils.xproj", "{B768BD29-12BF-4C7C-B093-03193FE244D1}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-host-build", "build_projects\dotnet-host-build\dotnet-host-build.xproj", "{1DBB7542-0345-4F4B-A84B-3B00B185D416}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-host-build", "src\build\dotnet-host-build\dotnet-host-build.xproj", "{1DBB7542-0345-4F4B-A84B-3B00B185D416}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RuntimeGraphGenerator", "setuptools\independent\RuntimeGraphGenerator\RuntimeGraphGenerator.xproj", "{EFC4FE68-83EB-40E4-BFA8-61D0B4626F25}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RuntimeGraphGenerator", "tools-local\setuptools\independent\RuntimeGraphGenerator\RuntimeGraphGenerator.xproj", "{EFC4FE68-83EB-40E4-BFA8-61D0B4626F25}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "update-dependencies", "build_projects\update-dependencies\update-dependencies.xproj", "{A28BD8AC-DF15-4F58-8299-98A9AE2B8726}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "update-dependencies", "src\build\update-dependencies\update-dependencies.xproj", "{A28BD8AC-DF15-4F58-8299-98A9AE2B8726}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5CE8410C-3100-4F41-8FA9-E6B4132D9703}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HostActivationTests", "test\HostActivationTests\HostActivationTests.xproj", "{386D412C-003C-47B1-8258-0E35865CB7C4}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HostActivationTests", "src\test\HostActivationTests\HostActivationTests.xproj", "{386D412C-003C-47B1-8258-0E35865CB7C4}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-deb-tool", "setuptools\dotnet-deb-tool\dotnet-deb-tool.xproj", "{F39F3D8B-B26F-4C77-B08C-D6CA753EE84E}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-deb-tool", "tools-local\setuptools\dotnet-deb-tool\dotnet-deb-tool.xproj", "{F39F3D8B-B26F-4C77-B08C-D6CA753EE84E}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestUtils", "test\TestUtils\TestUtils.xproj", "{42095367-4423-4157-BD31-D1A8E3B823B9}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestUtils", "src\test\TestUtils\TestUtils.xproj", "{42095367-4423-4157-BD31-D1A8E3B823B9}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyModel", "src\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.xproj", "{688870C8-9843-4F9E-8576-D39290AD0F25}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyModel.Tests", "test\Microsoft.Extensions.DependencyModel.Tests\Microsoft.Extensions.DependencyModel.Tests.xproj", "{4A4711D8-4312-49FC-87B5-4F183F4C6A51}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyModel.Tests", "src\test\Microsoft.Extensions.DependencyModel.Tests\Microsoft.Extensions.DependencyModel.Tests.xproj", "{4A4711D8-4312-49FC-87B5-4F183F4C6A51}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FAA448DA-7D1C-4481-915D-5765BF906332}"
EndProject
Expand Down
1 change: 1 addition & 0 deletions src/installer/BuildToolsVersion.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0.27-prerelease-01430-03
0 src/installer/pkg/DotnetCLIVersion.txt → src/installer/DotnetCLIVersion.txt
View file
File renamed without changes.
14 changes: 0 additions & 14 deletions src/installer/NuGet.Config
View file

This file was deleted.

83 changes: 83 additions & 0 deletions src/installer/build.proj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="BuildAndTest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="dir.props" />

<!-- required to build the projects in their specified order -->
<PropertyGroup>
<SerializeProjects>true</SerializeProjects>
</PropertyGroup>

<PropertyGroup>
<!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.-->
<RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild>
</PropertyGroup>

<PropertyGroup>
<TraversalBuildDependencies>
BatchRestorePackages;
ValidateExactRestore;
CreateOrUpdateCurrentVersionFile;
CreateVersionInfoFile;
BuildCustomTasks;
</TraversalBuildDependencies>
<TraversalBuildDependsOn>
$(TraversalBuildDependencies);
$(TraversalBuildDependsOn);
</TraversalBuildDependsOn>
</PropertyGroup>

<ItemGroup>
<Project Include="src/dir.proj" />
<Project Include="src/pkg/packaging/dir.proj"/>
<Project Include="$(MSBuildThisFileDirectory)src/test/dir.proj" Condition="'$(SkipTests)' != 'true'"/>
</ItemGroup>

<Target Name="BuildTraversalBuildDependencies"
DependsOnTargets="$(TraversalBuildDependencies)" />

<Target Name="BuildCustomTasks">
<MSBuild Projects="tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds" />
<MSBuild Projects="tools-local/tasks/core-setup.tasks.builds" />

<ItemGroup>
<CustomTaskDependencies Include="$(BuildToolsTaskDir)Newtonsoft.Json.dll" />
<CustomTaskDependencies Include="$(BuildToolsTaskDir)Microsoft.DotNet.PlatformAbstractions.dll" />
</ItemGroup>
<Copy SourceFiles="@(CustomTaskDependencies)"
DestinationFolder="$(LocalBuildToolsTaskDir)"
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="true" />
</Target>

<Target Name="BatchRestorePackages" Condition="'$(RestoreDuringBuild)'=='true'">
<Message Importance="High" Text="Restoring all packages..." />

<Exec Command="$(DnuRestoreCommand) %(DnuRestoreDirs.AdditionalArgs) %(DnuRestoreDirs.Identity)" StandardOutputImportance="Low" CustomErrorRegularExpression="^Unable to locate .*" />

<ItemGroup>
<_allPackagesConfigs Include="$(MSBuildProjectDirectory)\src\**\packages.config"/>
</ItemGroup>
<Exec Condition="'@(_allPackagesConfigs)' != ''" Command="$(NugetRestoreCommand) &quot;%(_allPackagesConfigs.FullPath)&quot;" StandardOutputImportance="Low" />
</Target>

<!-- Task from buildtools that uses lockfiles to validate that packages restored are exactly what were specified. -->
<UsingTask TaskName="ValidateExactRestore" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" />

<Target Name="ValidateExactRestore"
Condition="'$(AllowInexactRestore)'!='true'">
<ValidateExactRestore ProjectLockJsons="@(ProjectJsonFiles->'%(RootDir)%(Directory)%(Filename).lock.json')" />
</Target>

<Import Project="dir.targets" />
<Import Project="dir.traversal.targets" />
<Import Project="$(ToolsDir)clean.targets" />

<!-- Override RestorePackages from dir.traversal.targets and do a batch restore -->
<Target Name="RestorePackages" DependsOnTargets="BatchRestorePackages" />

<!-- Override clean from dir.traversal.targets and just remove the full BinDir -->
<Target Name="CleanAllProjects">
<RemoveDir Directories="$(BinDir)" />
</Target>

</Project>
Loading

0 comments on commit 5cf63ea

Please sign in to comment.