summaryrefslogtreecommitdiff
path: root/dir.props
AgeCommit message (Collapse)AuthorFilesLines
2019-06-26Merge branch 'release/3.0' into merge/master-to-release/3.0William Godbe1-1/+1
2019-06-15Fix duplicate imports in managed product build (#25174)Elinor Fung1-1/+2
2019-05-31Set IsPrelease=false in dir.propswtgodbe1-1/+1
2019-05-30Remove BuildTools from product build (#24841)Elinor Fung1-26/+3
* Remove BuildTools imports from product build * Split scripts for installing dotnet vs BuildTools
2019-05-29Use Arcade for native versioning (#24785)Elinor Fung1-6/+0
2019-05-23Fix missing version numbers in packaged files and getting IBC merge version ↵Elinor Fung1-5/+0
in official build (#24735) * Fix missing version numbers in packaged files in official build * Fix build script for getting IBC merge version
2019-05-21Switch NuGet package build to use Arcade instead of BuildTools (#24619)Elinor Fung1-103/+9
2019-05-13Was too aggressive with changes to PackageOutputPath property.Aaron Robinson1-2/+3
- This represents this repo's generated packages rather than packages it consumes.
2019-05-13Cleanup some build files (#24539)Aaron Robinson1-12/+0
* Remove OsEnvironment, PackagesDir, and CoreCLRBinDir properties * Replace usage of __BuildArch with BuildArch * Simplify test timing out on ARM64
2019-05-10Properly set the nuget cache for the repo (#24505)Aaron Robinson1-4/+3
* Properly set the nuget cache for the repo * Change coreclr NuGet package cache from "./packages" to "./.packages"
2019-05-06Port all managed product binaries to use SDK style projects (#24285)Aaron Robinson1-6/+7
Convert managed product binary to use SDK project system. - Uses Arcade for versions strings - Overrides Arcade defined output paths - should change in the future
2019-03-02Use arcade's version of dotnet to build (#22755)Steve MacLean1-1/+1
* Use arcade dotnet * Add cmake_msbuild.cmd Move msbuild.cmd to cmake_msbuild.bat Document intent that this file is only used to resolve Windows cmake dependency on desktop msbuild.exe Remove one instance of msbuild.cmd * Fix inittools.cmd * Remove spurious setup_vs_tools.cmd calls
2019-02-17Only import the RoslynPropsFile if it exists. (#22657)Tanner Gooding1-1/+1
2019-02-15Manually update the dependencies.props and move S.P.Corelib to use ↵Tanner Gooding1-11/+9
LangVersion=8.0 (#22452) * Update BuildTools to preview1-03713-01 (master) * Updating CoreCLR to use LangVersion=8.0 * Moving the Windows scripts to default to `dotnet msbuild` for managed components * Setting UseSharedCompilation=true * Changing some additional callsites that were using msbuild to use dotnet msbuild * Revert packages.builds to use Desktop msbuild on Windows * Fixing runtest.cmd to always set DotNetCli
2018-12-03Remove Hostx86/arm CrossGen from building and Simplify build.sh command line ↵Egor Chesakov1-2/+0
arguments for Linux/arm cross build (Part 2) (#21034) * Stop building and publishing Hostx86/arm crossgen on Linux/arm * Remove -crosscomponent argument and stop using CAC_ROOTFS_DIR environment variable in build.sh * Simplify the related logic in build.sh * Don't need to specify crosscomponent in tests/scripts/run-pmi-diffs.py * Don't set CAC_ROOTFS_DIR in buildpipeline, Jenkins files and in tests/scripts/run-pmi-diffs.py * Adjust documentation
2018-09-27Maestro dependency update without buildtools (#20143)Viktor Hofer1-0/+2
* Update BuildTools, CoreClr, CoreFx, CoreSetup, PgoData to preview1-03224-03, preview1-26925-05, preview1-26925-06, preview1-26925-01, master-20180925-0031, respectively * Enable RestoreOutputPath override * Disable System.Security.Cryptography.Pkcs.Tests To help unblock corefx, etc. update. * Revert buildtools changes * Disable buildtools auto updates
2018-09-13Publish Hostx64/arm32 crossgen and libclrjit.so on LinuxEgor Chesakov1-1/+4
2018-07-19Build xunit wrappers the same way on windows and unix (#18695)Sven Boemer1-12/+2
* Initial change to allow build wrappers and runtest.py * Build xunit wrappers on unix The generated wrapper needs to target netcoreapp on unix. I had to exclude assets from the xunit package and introduce a dependency on the private corefx bits, to resolve a dependency conflict in which the generated wrapper was depending on an older System.Runtime.dll than the helper library. I also disabled binclash logging, because the wrapper build binplaces the helper library to the same location multiple times. I couldn't find a simple way to disable binclash logging for the wrapper build only, since that requires passing an empty switch to run.exe, and bash word splitting makes this nontrivial from build-test. * Correctly generate TestEnv xplat Note that this will still require changes to the test wrapper to actually source the TestEnv on unix * Build xunit wrappers using SDK * Target netcoreapp2.0 in xunit wrappers This way, the wrappers can build even if the 2.1 SDK isn't installed on the machine. * Restore to packages directory for xunit wrappers * Move common properties out to dir.common.props When building wrappers using the SDK, we need some basic properties (like the build os/arch/config, and the output directories) to be set. I factored out properties used by both the old test build and the new SDK-project test build. At first I tried using Directory.Build.props (which is automatically imported by the SDK), but our test build already imports SDK targets in various places, so this was resulting in duplicate imports. Instead, I used dir.common.props, and made the imports explicit. * Remove desktop-specific test wrapper csproj * Pass build os/arch/type and logsdir to msbuild from runtest.py * Remove xunit wrapper helper library from traversal build * Fix parameter passing in build-test.sh Use bash arrays to pass parameters for the build command. This makes it possible to pass arguments with spaces to build_Tests_internal. We use this to disable binclashlogging selectively (for the xunit wrapper build only). * Clean up factored .props files * Undo runtest.sh changes * Use latest xunit console runner everywhere * Remove extra StaticDependency on xunit.runner.console * Eliminate tests/src/dir.common.props, and rename dir.sdkbuild.props tests/src/dir.common.props was only used for the desktop-specific xunit wrapper helper library. There's no need for it any more, so its properties have been moved into tests/src/dir.props. dir.sdkbuild.props has been renamed to dir.common.props, since it contains properties used by SDK projects and buildtools projects. This change also re-enables the test build. * Reintroduce dir.sdkbuild.props as a place for SDK-only props With this, some properties shared by SDK projects can go in a global location. The TargetFramework is shared by all SDK projects in the test tree. This change also uses a property for the xunit package directory that contains the xunit.console.dll we copy to core_root. * Add xml namespace to dir.common.props This fixes a failure in the windows build. * Satisfy xunit analyzer * Satisfy xunit analyzer again * Use SDK msbuild to build wrappers On windows, the use of run.exe, config.json, and msbuild.cmd uses msbuild.exe on the path. This change will build wrappers using the local SDK via "dotnet msbuild", bypassing run.exe. Run.exe will go away entirely with the move from buildtools to arcade, so other build invocatios should follow suit. * Remove Microsoft.CSharp.Core.targets workaround UseBuildTools used to be true all the time. Now that we are building wrappers on core, UseBuildTools becomes false. However, the rest of the runtest.proj expects to build using buildtools, so we keep UseBuildTools true until we switch to arcade. The CSharpCoreTargetsPath was imported when running on core only. This used to happen only on unix, but now it also happens when building runtest.proj for the xunit wrappers on windows. On unix, this targets file was a symlink to itself to work around some buildtools logic that expected the file to exist. This workaround no longer appears necessary, and on windows, this was never used in the first place, so this change removes it. * Remove UseRoslynCompilers prop and unify roslyn import UseRoslynCompilers was introduced in buildtools by https://github.com/dotnet/buildtools/pull/947, with different behaviors on windows/unix. It was removed by https://github.com/dotnet/buildtools/pull/1974, so we can unify our roslyn imports now. * Don't copy xunit dlls to corefx test host The corefx tests run on specific versions of xunit dlls, defined in CoreFX.depproj. We want to use these versions in the test host, not those in CORE_ROOT, so exclude these from being copied to the test host directory. This fixes the failing corefx tests. * Don't pass run.exe arguments through build-test.cmd in test pipeline These arguments get passed along to the xunit wrapper build as unprocessed build args. They need to work for "dotnet msbuild" (used for the wrapper build) as well as for run.exe. * Fix parameter passing of priority arg in build-test.cmd UnprocessedBuildArgs should contain arguments in the format expected by msbuild, not by run.exe. * Fix parameter passing of unprocessed args in build-test.cmd The "--" syntax is used by run.exe to pass everything following to msbuild directly. It should not be a part of unprocessed args. * Pass TargetsWindowsArg to wrapper build in build-test.cmd Helix builds tests on windows and runs them on unix using the xunit wrappers. When cross-building the wrappers like this, TargetsWindows is set to false by the test build pipeline. This variable ensures that the wrapper uses correct directory separators when invoking the test .sh file. * Pass BuildTestsAgainstPackages arg to exclude unix tests Helix builds xunit wrappers on windows, and runs them on unix. The BuildTestsAgainstPackages should currently be set to true in the windows wrapper build to properly filter the .cmd files based on exclusions in issues.targets.
2018-03-31[Arm64] Add x64_arm64 crossgen to tools packageSteve MacLean1-1/+1
2018-03-14Include Linux/cross-arch components into NuGet packages (#16859)Egor Chesakov1-0/+1
* Add __DoCrossArchBuild settings to config.json * HasCrossTargetComponents computes to 'true' on Linux when __DoCrossArchBuild is 1 in dir.props * Include cross-architecture libclrjit.so crossgen into NuGet props files when HasCrossTargetComponents is 'true' * Pass $__DoCrossArchBuild to run.sh when generating NuGet packages in build.sh
2017-12-05Remove unwanted changesMichal Strehovský1-1/+0
2017-12-05Put default interfaces behind a define (#15358)Michal Strehovský1-0/+5
This is needed so that we can turn default interfaces off in release branches. I can't find a central location where the PRERELEASE flag could be defined because native and managed builds seem to be completely disconnected. To limit the risk of only flipping the flag in one build type, I'm adding a test that verifies being able to load an interface with default methods matches what RuntimeFeature says.
2017-11-02Merge branch 'master' into master-mergeMichal Strehovský1-6/+13
2017-10-30Implement auto dependency flow Repo API (#14518)Wes Haggard1-2/+2
2017-10-30Remove coreclr patches from source-build repoWes Haggard1-2/+3
Updates the branch to include patches that were applied in source-build: 0001-Respect-NUGET_PACKAGES-if-it-is-set.patch 0002-Unify-CLI-and-BuildTools-Versions.patch 0003-Add-clear-to-NuGet.config.patch 0004-PATCH-Use-clang-3.9-by-default.patch
2017-10-28Enable Portable Pdb generation (#14721)Vance Morrison1-2/+0
When https://github.com/dotnet/corefx/pull/24025 goes through to change coreFX over to use portable PDBs we want to do the same for System.private.Corelib.pdb in CoreCLR. This change does this.
2017-10-10Turn on source link support (#14399)Vance Morrison1-0/+8
* Use Portable PDBs and turn on SourceLink This makes us uniform. Allows VSCode (which does not suport MSPdbs) use on Windows. * Allow DebugType to be overridden (on the command line) * Turn off portable PDB support for now
2017-10-03Update Buildtools and Roslyn (#14228)Jose Perez Rodriguez1-2/+2
* Update Buildtools and Roslyn * Fixing importing of the roslyn files on msbuild 14.0 * Correctly looking for the latest VS Installation
2017-09-29Merge branch 'master' into merge_masterDavid Wrighton1-6/+6
2017-09-18Correct typos in reporoot/dir.propsJacek Blaszczynski1-6/+6
2017-09-13Merge branch 'master' into update_from_masterDavid Wrighton1-11/+8
2017-09-09Enable auto-update for PGO data (#13883)Daniel Podder1-6/+0
Move PgoDataPackageVersion into dependencies.props, which enables auto-update functionality. Also, update optdata version to 20170908-1805.
2017-08-31Update optdata to version 20170830-0123 (#13717)Daniel Podder1-1/+1
2017-08-29Fix dir.props BuildVersionFile overrideDavis Goodin1-4/+5
The override needs to be before the Build.Common.props import, because BuildVersion.targets is in Build.Common.props and it's what's responsible for importing BuildVersionFile if it exists.
2017-08-22Disable default BuildNumberMajorwtgodbe1-1/+0
2017-08-18Update optdata in master to version 20170817-0120Michelle McDaniel1-1/+1
2017-08-18Revert "Update optdata in master to version 20170817-0120"Michelle McDaniel1-1/+1
This reverts commit 694eb48ae21ae79ca745fa3448be87d144ff912d.
2017-08-18Update optdata in master to version 20170817-0120Michelle McDaniel1-1/+1
2017-08-15Add full URL to the FileVersion information created a build time (#13352)Vance Morrison1-1/+4
* Tag dlls with the URL of the github commit * Fix name of BuildVersion file for non-official builds This fix does something very safe (only overrides the name of the buildVersionFile with a name from the OfficialBuildId variable if that variable is non-empty. This is importnat because otherwise is that the override ALWAYS kicks in and sometimes corrupts the name, which has the effect of throwning the information in the BuildVersionFile (namely the version number) out * Update to latest build tools.
2017-07-19Enable official builds from dev/defaultintfJC Aguilera1-0/+1
Updating the PreReleaseLabel name so we get official Default Interface's builds.
2017-07-19Fix errors in MSBuild prperties initialization in ↵Jacek Blaszczynski1-1/+2
System.Private.CoreLib.csproj (#12356) Fixes issue #12355 Project System.Private.CoreLib.csproj imports directly Microsoft.Net.Compilers.props at line# 4 before including dir.props from repo root. $(RepoRoot)/dir.props imports Microsoft.Net.Compilers.props at line# 186. As a result of this sequence of duplicated project imports and lack of safeguards against importing the same .props file twice MSBuild reports that Microsoft.Net.Compilers.props file is included twice with warning that second import will be ignored - in this case not evaluated. This results in initialization of Microsoft.Net.Compilers.props values to defaults because MSBuild evaluates Microsoft.Net.Compilers.props only once before $(RepoRoot)/dir.props are included. Removing import of Microsoft.Net.Compilers.props from System.Private.CoreLib.csproj and moving $(RepoRoot)/dir.props file import to top of System.Private.CoreLib.csproj solves these problems by ensuring expected order of evaluation of Microsoft.Net.Compilers.props file by MSBuild after all project wide values are initialized in $(RepoRoot)/dir.props.
2017-07-12Update optdata in master to version 20170712-0121 (#12770)Daniel Podder1-1/+1
2017-06-30Update optdata to version 20170630-0138Daniel Podder1-1/+1
2017-06-13Fix Linux PGO optdata consumption + PGO count update (#12239)Daniel Podder1-1/+1
* Update PGO package version to 20170612-1411 * Fix PGO optdata path issue on Linux
2017-06-10Update PGO counts to version 20170609-1125 (#12201)Daniel Podder1-1/+1
2017-06-06Test packages from current build in pipelinewtgodbe1-8/+4
2017-06-01Fix optdata restore functionality (#11935)Daniel Podder1-0/+6
Fix optdata restore functionality (#11935) Bring back optdata restore functionality following the move to 2.0 BuildTools and csproj-based CLI. Disable a harmless warning that broke the Linux build when consuming PGO counts due to -Werr. Fix #11796 for master
2017-06-01Merge pull request #11860 from rartemev/fix_tests_build_4Roman Artemev1-3/+7
Fixed tests build on Linux
2017-05-31Default to portable build in dev and official builds (#11985)Gaurav Khanna1-0/+3
2017-05-29Make linux test build workedRoman Artemev1-3/+7