Commit graph

50 commits

Author SHA1 Message Date
John Beisner
7b3c1bbb23 Adding consistent "Project" headers to inported props and target files.
(cherry picked from commit 74ad01b576)
2017-09-27 16:54:39 -07:00
Daniel Plaisted
2b134c91fe Support new artifacts layout in tests and other build logic
(cherry picked from commit 13da213183)
2017-09-27 14:20:05 -07:00
Daniel Plaisted
8385d37185 Move dir.props to auto-imported Directory.Build.props
This is necessary for setting the intermediate output path to work correctly

(cherry picked from commit ae0aa8ed24)
2017-09-27 14:16:37 -07:00
William Li
68c71d225b Stop produce duplicated package for VSTS build definition
Currently VSTS is producing duplicate package and they are running into
each other will producing

Today:
Linux x64 build definition: both .deb and .tar.gz
Ubuntu 16.04 build definition: both .deb and .tar.gz (ex.
dotnet-sdk-2.0.0-preview3-006477-linux-x64.tar.gz,
dotnet-sdk-debug-2.0.0-preview3-006477-linux-x64.tar.gz,
dotnet-sdk-internal-2.0.0-preview3-006477-linux-x64.tar.gz)

After this change:
Linux x64: .tar.gz
Ubuntu 16.04: .deb

No change for windows and macOS
Tested on Ubuntu with and without --linux-portable and windows
2017-06-16 07:32:20 -07:00
Nick Guerrera
a08ebb95a0 Generate equivalent of resx .Designer.cs in build 2017-06-06 21:47:58 -07:00
Matt Ellis
3aa59d98bd Remove CoreCLRRid property
This property was only legitimately by the project which wants to
restore `crossgen`. Since that now comes from
Microsoft.NETCore.App (i.e. the shared framework) use
SharedFrameworkRid instead.

I also ensured that we passed UsePortableLinuxSharedFramework to
dotnet restore when restoring the tool projects, so we can use the
platform specific RID when non portable build.
2017-05-12 14:48:49 -07:00
Livar Cunha
737b68b460 Fixing the imports for signing. 2017-05-11 11:04:41 -07:00
Livar Cunha
dd01dbf4ce Bringing down MicroBuild.Core props and targets separately from build_tools. 2017-05-10 15:58:46 -07:00
Livar Cunha
a3baacaaf8 Updating the stage0 in release/2.0.0 to use a release/2.0.0 stage0 and turning off implicit package target fallback in the CLI. 2017-04-27 09:29:39 -07:00
Livar Cunha
e286c65d25 Removing Additional Framework entirely and renaming LegacyRuntime to something more appropriate: BackwardsCompatibleRuntimes. Also, turning off some tests that I forgot to turn off for linux-x64. 2017-04-08 00:31:27 -07:00
Livar Cunha
772e838ff8 Removing the additional shared framework from the official stage2 build of the CLI. Instead, I also create a stage2 build with the legacy runtime so that we can continue to run tests tthat depend on it, but most importantly, we will be able to run backwards compatibility tests using it. 2017-04-08 00:31:27 -07:00
Eric Erhardt
a7becbe6d8 Fix passing /p:DISABLE_CROSSGEN on cli.
When passing a property using the commandline, it is not flown through to "dotnet publish" calls.  So instead of using "dotnet publish", just use the MSBuild task to invoke the Publish target on the reidst project.  This way properties flow correctly.

I also did a little cleaning of unused build logic.
2017-04-04 17:50:28 -05:00
Justin Goshi
45a1e9e56c Allow host info passed in from the command line to override machine settings (#5904)
* Allow host info passed in from the command line to override machine settings

* Simplify the logic

* Address PR comments to keep a separate HostRid and HostOSName that are static

* Rename to BuildInfo.props

* Address PR comments

* Fix the previous merge

* Fix spacing

* Address PR comments
2017-03-08 09:10:53 -10:00
Piotr Puszkiewicz
12fde69e86 Move remaining Publish actions to redist.csproj 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
01ca1b1208 Ensure redist publishes Roslyn
Also fix issue found in PR
2017-02-28 01:39:45 -08:00
Piotr Puszkiewicz
9bdd38cc19 Initial 2017-02-28 01:17:22 -08:00
Piotr Puszkiewicz
43266d2d9a Move publishing static MSBuildExtensions to redist.csproj 2017-02-27 17:11:03 -08:00
Justin Goshi
5bb7ca8112 Add back BranchInfo.props 2017-02-24 10:34:16 -08:00
Justin Goshi
74e343e111 First pass at cleaning up the global properties files 2017-02-23 17:07:26 -08:00
Justin Goshi
08ffc78be6 Merge branch 'master' into dev/jgoshi/refactorPublishTarget 2017-02-23 09:01:44 -08:00
Piotr Puszkiewicz
1199df1c05 Move tool deps file creation into redist.csproj 2017-02-22 22:47:11 -08:00
Justin Goshi
8b2933839c Merge 2017-02-22 16:56:34 -08:00
Justin Goshi
e894d7e60e Refactor publish.target 2017-02-22 16:54:15 -08:00
Unknown
1c9f2e9b83 ProjectsToPublish 2017-02-22 15:33:55 -08:00
Piotr Puszkiewicz
5be3a70121 RootProject property 2017-02-22 15:31:55 -08:00
Justin Goshi
02e47f1d00 Address PR comments 2017-02-22 10:10:54 -08:00
Justin Goshi
70b6dc3be6 Merge branch 'master' into dev/jgoshi/refactorCrossgenTarget 2017-02-22 10:08:54 -08:00
Justin Goshi
d6dccfe75b Fix build breaks 2017-02-21 15:57:16 -08:00
Justin Goshi
2eb2c00b30 Refactor props in crossgen.target 2017-02-21 14:22:36 -08:00
Justin Goshi
30a43b3bda Merge 2017-02-17 09:53:00 -08:00
Justin Goshi
58d167f3e5 Refactor properties out of Compile.targets 2017-02-16 12:21:15 -08:00
Justin Goshi
8e58a247b0 Finish renaming props file to remove Microsoft.Dotnet.Cli prefix 2017-02-16 11:16:20 -08:00
Justin Goshi
c8fb586677 merge 2017-02-16 08:58:40 -08:00
Piotr Puszkiewicz
0e5633e527 Remove BundledRuntimes properties 2017-02-15 19:37:51 -08:00
Justin Goshi
e66f6cd1a3 Do not rename the file yet 2017-02-15 12:05:36 -08:00
Justin Goshi
27182f293d merge 2017-02-14 16:43:23 -08:00
Justin Goshi
62abef428e Rename build files 2017-02-14 15:42:13 -08:00
Justin Goshi
87ee130ab5 Create CoreSetupInfo.props 2017-02-14 10:30:28 -08:00
Justin Goshi
3dad3afc03 Remove more properties from build.proj 2017-02-13 15:08:10 -08:00
Piotr Puszkiewicz
a101c703a1 First try at refactor of Prepare.targets (#5647)
* First try at refactor of Prepare.targets

* Enable restore of CLI build tasks

* Fix up build

* Feedback

* Newlines

* Add new props to sln

* CommitCount

* NuGet.config

* WorkingDir

* packages dir path

* Add missing nuget.configs

* Workaround for https://github.com/NuGet/Home/issues/4583

* Match NuGet.Config casing

* Put back Version Badge Properties

* Remove duplicate
2017-02-13 13:06:30 -08:00
Justin Goshi
12e540920b Fix build break 2017-02-08 19:34:48 -08:00
Justin Goshi
2eac755db7 Refactor 2017-02-08 19:13:30 -08:00
Justin Goshi
50493d2dab Address PR comments 2017-02-08 14:02:29 -08:00
Justin Goshi
2b15651716 Trying to fix the build breaks first 2017-02-07 17:34:41 -08:00
Justin Goshi
83b46ebc17 Generate host and build info and store them in .props files 2017-02-07 15:45:19 -08:00
Eric Erhardt
d4153815d5 Update the CLI to netcoreapp2.0. 2017-01-26 07:28:59 -06:00
Eric Erhardt
c481ad9cdc Merge all hard-coded versions and version suffixes to be defined in a single spot. 2017-01-10 20:54:11 -06:00
Livar Cunha
b41eb43883 Updating our projects and test assets to work with the latest SDK. 2017-01-05 19:44:52 -08:00
Piotr Puszkiewicz
d14698f1f6 Bump MSBuild Version to 15.1.0-preview-000503-01 (#5199)
* Bump MSBuild Version to 15.1.0-preview-000503-01

* tool_csc->tool_roslyn

* pull some properties up to dir.props

* Move Roslyn to "Roslyn" subdirectory

* Fix relative paths in RunCsc.*

* Add removal of csc & vbc from deps.json

* Revert roslyn to 2.0.0-rc3-61212-03

* netcoreapp -> 1.0.3
2017-01-05 14:56:11 -08:00
Piotr Puszkiewicz
f18967e39a Update CLI's MSBuild Version to 15.1.0-preview-000451-02 (#4889)
* Centralize definition of MSBuild Version in CLI

* MSBuild --> 15.1.0-preview-000451-02
2016-12-01 20:10:42 -08:00