Commit graph

512 commits

Author SHA1 Message Date
Matt Ellis
47b75cfa12 Misc build changes
For injestion into a composed build, I'm adding some minor tweaks to
our build system:

 - Teach DownloadFile task how to consume file:// URLs so we can pass
   around artifacts using local sources.
 - Add `SkipBuildingInstallers`, an MSBuild property that can be set
   to true when installers (pkgs, msis, debs, rpms and the like) do
   not need to be built.
 - Add `IncludeAdditionalSharedFrameworks`, an MSBuild property that
   can be set to prevent additional shared frameworks (i.e. shared
   frameworks that the CLI does not use at runtime) from being
   downloaded and included in our payload.
 - Add `IncludeNuGetPackageArchive` an MSBuild property that can be
   set to prevent the lzma archive containing all the nupkgs we
   restore on first run from being included in the final output.
 - Provide a way to change the Uri use for blob storage (so the
   composed build and point at a local folder that looks like blob
   storage to pick up artifacts from).
2017-02-15 16:52:46 -08:00
Justin Goshi
2664015e55 Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 16:01:37 -08:00
Livar
a1f4e81aec Merge branch 'rel/1.0.0' into piotrpMSFT/bump/15.1.548 2017-02-15 13:03:27 -08:00
Steve Desmond
bcad939b91 don't try to make crossgen executable if crossgen is disabled (it might not exist!) 2017-02-15 15:39:55 -05:00
Justin Goshi
4d38a9be97 Fix the file 2017-02-15 12:00:57 -08:00
Justin Goshi
74493a13e9 Delete the renamed file 2017-02-15 11:59:51 -08:00
Justin Goshi
b40635f8df Fix up the file 2017-02-15 11:59:30 -08:00
Justin Goshi
2f298ed616 Now add the original file without any rename 2017-02-15 11:57:11 -08:00
Justin Goshi
da81fcaa30 One more try. Delete the file first 2017-02-15 11:56:46 -08:00
Justin Goshi
832e8dc6e0 try new spacing 2017-02-15 11:54:35 -08:00
Livar Cunha
6c07b929bd The variable was missing dollar sign parenthesis in the target file. 2017-02-15 11:53:31 -08:00
Justin Goshi
0c7a94e7cb Trying to figure out spacing 2017-02-15 11:52:14 -08:00
Justin Goshi
ce0ae2553d fix tabs 2017-02-15 11:51:00 -08:00
Justin Goshi
688195b8b5 try again 2017-02-15 11:47:33 -08:00
Justin Goshi
e85f4069c4 Now rename 2017-02-15 11:43:27 -08:00
Justin Goshi
7a894df413 Trying to fix the diff of one file 2017-02-15 11:42:34 -08:00
Justin Goshi
72db23ed4d Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 10:28:47 -08:00
Piotr Puszkiewicz
627c03b070 Bump MSBuild to 15.1.548 2017-02-14 22:47:37 -08:00
Piotr Puszkiewicz
25e0020da5 Merge branch 'rel/1.0.0' into tp20170210-02 2017-02-14 16:51:59 -08:00
Nate Amundson
73d59c423d Remove import of dir.props from Signing.proj
The build agents in our VSTS pool don't yet have MSBuild 15, so the
signing project can't import any MSBuild 15 projects. (The signing
project is built with the desktop MSBuild because MicroBuild depends on
it.)  Once the agents have MSBuild 15, this import can be added back.
2017-02-14 16:49:57 -08:00
Justin Goshi
27182f293d merge 2017-02-14 16:43:23 -08:00
Piotr Puszkiewicz
a906069859 Merge pull request #5693 from dotnet/dev/jgoshi/refactorBuildProj
Remove more properties from build.proj
2017-02-14 16:19:53 -08:00
Piotr Puszkiewicz
6415c2334a Merge branch 'rel/1.0.0' into tp20170210-02 2017-02-14 15:47:24 -08:00
Justin Goshi
62abef428e Rename build files 2017-02-14 15:42:13 -08:00
Livar Cunha
8a53b08959 Running chmod after crossgen so that our chmod changes are not overwritten by it. 2017-02-14 13:13:08 -08:00
Justin Goshi
87ee130ab5 Create CoreSetupInfo.props 2017-02-14 10:30:28 -08:00
Rohit Agrawal
9cf8e8c57f update nuget to 4.0.0-rtm-2283 (#5691) 2017-02-13 18:11:51 -08:00
Justin Goshi
3b9ecf7f86 Address PR comments 2017-02-13 17:37:23 -08:00
Rama Krishnan Raghupathy
badab4680d Adding the shim of dotnet-cache
Adds filter profile option to publish
2017-02-13 16:01:06 -08:00
Justin Goshi
3dad3afc03 Remove more properties from build.proj 2017-02-13 15:08:10 -08:00
Livar
6ef4bdf4e2 Merge branch 'rel/1.0.0' into new_shared_framework_versions 2017-02-13 13:44:57 -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
Livar
251237b481 Merge branch 'rel/1.0.0' into drop_suffix 2017-02-11 11:52:10 -08:00
Livar Cunha
1d61bf97ed Updated the Shared Framework to 1.1.1 and 1.0.4. 2017-02-10 23:05:16 -08:00
Eric Erhardt
01d2505c03 Merge pull request #5662 from eerhardt/FixNetStandardLibrary
Fix dotnet new classlib to contain the correct NETStandard.Library version.
2017-02-10 20:26:11 -06:00
Livar Cunha
167e2da398 Updating msbuild to 15.1.0-preview-000545-01. 2017-02-10 16:13:15 -08:00
Justin Goshi
483e6bd9c1 Address PR comments 2017-02-10 14:13:44 -08:00
Justin Goshi
64ccab43e8 Merge branch 'master' into dev/jgoshi/refactorTasks 2017-02-10 13:38:07 -08:00
Eric Erhardt
25f9a1bbc7 Fix dotnet new classlib to contain the correct NETStandard.Library version.
Fix #5638
2017-02-10 14:22:07 -06:00
Justin Goshi
33d83d6639 Refactor tasks 2017-02-10 12:13:44 -08:00
Eric Erhardt
e7689a3116 Merge pull request #5648 from eerhardt/master-UpdateDependencies
Upgrade update-dependencies
2017-02-10 14:02:12 -06:00
Arun Mahapatra
4621c1a6ec Insert TestPlatform v15.0.0-preview-20170210-02. 2017-02-10 21:58:34 +05:30
Livar
1c896d4402 Adding release suffix as a modified parameter of the build and removing NugetVersionForVS. we don't need that concept. 2017-02-09 22:31:46 -08:00
Livar Cunha
81a94c0902 Enabling publishing the nupkgs produced by the CLI to blob storage and hooking up DropSuffix to the VS targeted nupkg of the CLI. 2017-02-09 15:47:53 -08:00
eerhardt
72af77de1b Update CoreSetup to beta-001509 2017-02-09 16:56:32 -06:00
Unknown
ee34309e4a Merge remote-tracking branch 'refs/remotes/dotnet/master'
Conflicts:
	build/Microsoft.DotNet.Cli.Prepare.targets
2017-02-09 11:00:02 -08:00
Piotr Puszkiewicz
806b294777 Overwrite props files if they exist 2017-02-09 10:50:21 -08:00
Eric Erhardt
454dd10f8d Update dotnet new to use the new 2.0 templates. 2017-02-09 10:18:39 -06:00
Piotr Puszkiewicz
6b7ad0544f small refactor 2017-02-09 00:26:40 -08:00
Livar
a88df7953c Merge branch 'rel/1.0.0' into drop_suffix 2017-02-08 20:35:49 -08:00
Justin Goshi
13fd6d85d7 Remove stuff from prepare.targets 2017-02-08 19:22:56 -08:00
Justin Goshi
2eac755db7 Refactor 2017-02-08 19:13:30 -08:00
Livar Cunha
d373ce8911 Enabling publish with drop suffix to still publish to a suffix based folder in blob to avoid conflicts. 2017-02-08 18:17:04 -08:00
Livar Cunha
35fc8c1d0e Step one of introducing a flag to drop the suffix out of our build versions. 2017-02-08 15:26:47 -08:00
Justin Goshi
50493d2dab Address PR comments 2017-02-08 14:02:29 -08:00
Justin Goshi
d51bfd1bea Merge branch 'master' into dev/jgoshi/firstPassProps 2017-02-08 11:57:58 -08:00
Eric Erhardt
546d62061a Merge branch 'master' into rel100toMaster 2017-02-08 12:30:32 -06:00
Eric Erhardt
56d391caad Fix up the merge so it gets past Prepare and Compile. 2017-02-08 12:26:04 -06:00
Rohit Agrawal
6d492a9ab1 Update Microsoft.DotNet.Cli.DependencyVersions.props 2017-02-08 08:25:30 -08:00
Piotr Puszkiewicz
211255d6c4 Remove Stage1 compilation 2017-02-07 19:41:45 -08:00
Justin Goshi
2b15651716 Trying to fix the build breaks first 2017-02-07 17:34:41 -08:00
Justin Goshi
b927922b65 Address PR comments and fix build break 2017-02-07 16:52:08 -08:00
Justin Goshi
83b46ebc17 Generate host and build info and store them in .props files 2017-02-07 15:45:19 -08:00
Piotr Puszkiewicz
0a634d5174 Add incrementality check for MSI generation 2017-02-07 10:56:06 -08:00
Mike Lorbetske
947fbfbd5b Update template engine templates version to absorb the fix 2017-02-06 13:55:05 -08:00
Piotr Puszkiewicz
b0a5d53ed5 Merge rel/1.0.0 to master 2017-02-06 12:43:57 -08:00
Eric Erhardt
e947baaa17 Update Microsoft.NETCore.App to 2.0.0-beta-001507-00.
Use the crossgen and jit that comes with Microsoft.NETCore.App so we don't have to keep a corresponding CoreCLR version around.

Remove workarounds for crossgen bug https://github.com/dotnet/coreclr/issues/9118
2017-02-06 14:37:39 -06:00
Eric Erhardt
6f666ab7af Update installer monikers.
Also removing a lingering registry key that was originally needed for the rc2 => preview1 SDK re-branding.  This is no longer necessary.
2017-02-06 13:08:44 -06:00
Rohit Agrawal
fb4977e5f8 update nuget and sdk
update nuget to 4.0.0-rtm-2265
and sdk to 20170205-2
2017-02-05 11:08:33 -08:00
Unknown
8671021577 Update MSBuild 2017-02-03 17:07:53 -08:00
Nate Amundson
1db92f8c69 Temporarily use sandboxes for publishing
During the official build transition, use sandboxes for:
1.  Blog container for the artifacts and checksums
2.  MyGet feed
3.  VS NuGet feed
4.  Versions repo

In addition, skip publishing packages to the apt-get repo, because a
sandbox is not trivial to configure.
2017-02-03 12:09:55 -08:00
Nate Amundson
83ca9bf952 Add checked-in build definitions
These build definitions will be used by pipebuild to build the product.

The signing now uses MicroBuild because the builds are being moved to
the DevDiv VSTS instance, and the Microsoft Code Signing system which
was used in MSEng is not supported there.

MicroBuild does not support the .NET Core MSBuild, so the full-framework
MSBuild is used to build the signing targets.  For this reason, the
signing logic is implemented as a standalone MSBuild project.
2017-02-03 12:09:53 -08:00
Piotr Puszkiewicz
f69f0ed266 Bump MSBuild to 15.1.0-preview-000544-02 (#5567) 2017-02-02 18:00:03 -08:00
Mike Lorbetske
ce59e6b19f Bug 378740 - Razor view precompilation, framework switch casing, framework options for class library (#5560) 2017-02-02 15:48:25 -08:00
Eric Erhardt
c27029a020 Update Microsoft.NETCore.App to 2.0.0-beta-001486-00 2017-02-02 17:31:07 -06:00
Rohit Agrawal
bffbee2b91 update nuget to 4.0.0-rtm-2259 (#5551) 2017-02-01 20:28:06 -08:00
Eric Erhardt
208776ed69 Merge master into local branch. 2017-02-01 18:39:32 -06:00
Eric Erhardt
a2c1a39d07 Fix projects and tests after merge of rel/1.0.0. 2017-02-01 18:35:52 -06:00
Eric Erhardt
9404dd2f98 Update MSBuild to 15.2.0-preview-000002-01.
This contains the fix for https://github.com/Microsoft/msbuild/issues/1634
2017-02-01 15:59:35 -06:00
Eric Erhardt
7543551602 Disable EnsureStageSeparation test until we can get a new stage0 with a new MSBuild that has the appropriate fixes. 2017-02-01 15:46:24 -06:00
Eric Erhardt
9f0bb778a1 Merge rel/1.0.0 into master. 2017-02-01 14:32:59 -06:00
seancpeters
2d93968a88 New3 integration (#5430)
* Partial conversion to new3. 2 tests fail due to browserlink not restoring.

* new cache initialization

* More lzma changes, and removed a razor ref from templates

* Ephemeral hive flag added to tests that need it

* Updated the template engine version to build against. Minor code cleanup

* Config changes to make template versions separate from template engine versions

* Changed dotnet new versioning to use Product.Version

* Fixing Archiver.csproj

* Fixing dotnet new test.

* Fix LZMA Package Source Condition

* Workaround for newline differences.

* fixed tests with changed template parameters. Added a new3 template non-match test
2017-01-31 17:31:37 -08:00
Eric Erhardt
f6a5dd1146 Fix crossgen error on netcoreapp1.0 assemblies. 2017-01-31 15:24:10 -06:00
Eric Erhardt
7324aa45d0 Update Microsoft.NETCore.App to 2.0.0-beta-001450-00 2017-01-31 13:11:22 -06:00
Piotr Puszkiewicz
d2035ff036 Merge remote-tracking branch 'refs/remotes/dotnet/rel/1.0.0-rc3'
Conflicts:
	build/Microsoft.DotNet.Cli.DependencyVersions.props
2017-01-30 23:27:48 -08:00
Faizan2304
3eee54e4f9 Inserting localize testplatform (#5510) 2017-01-30 21:05:16 -08:00
Eric Erhardt
fd65cb03b6 Update dotnet new to generate a "2.0" project. 2017-01-29 09:46:46 -06:00
Eric Erhardt
ef35dbc768 Fix crossgen executable permissions
Workaround https://github.com/NuGet/Home/issues/4424
2017-01-28 13:21:16 -06:00
Rohit Agrawal
4c55fb6211 update nuget and sdk rtm-2241 (#5447)
* update nuget and sdk rtm-2241

* Applying the no packagereference workaround.

* Fix merge issue

* add comments for restore related workarounds added in test assets
2017-01-27 19:12:35 -08:00
Piotr Puszkiewicz
ba69c88c79 Work around build test.sln race condition until fixed (#5490)
* Remove GenerateRuntimeConfigurationFiles from this library

* Disable parallel build of test.sln

* PR feedback
2017-01-27 17:13:04 -08:00
Piotr Puszkiewicz
e121f4cbf3 Merge branch 'rel/1.0.0' into piotrpMSFT/infra/outception 2017-01-27 12:59:20 -08:00
Piotr Puszkiewicz
31a6da880f Reverse installation order of shared frameworks 2017-01-27 11:49:54 -08:00
Piotr Puszkiewicz
188c5d1022 Merge branch 'rel/1.0.0' into piotrpMSFT/infra/outception 2017-01-27 11:20:02 -08:00
Piotr Puszkiewicz
bbf14163a4 Merge branch 'rel/1.0.0' into PortChange 2017-01-27 02:08:49 -08:00
Piotr Puszkiewicz
401a2dd2ce pr feedback 2017-01-27 00:56:51 -08:00
Piotr Puszkiewicz
c4e928a18d Cleanup 2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
c25abfb7c7 WiP 2017-01-27 00:46:09 -08:00
Livar
422b03cee4 Update the template engine version again. 2017-01-26 22:55:16 -08:00
Livar
ef95add8f6 Update the template engine to the correct build. 2017-01-26 20:55:41 -08:00
Parallels
c849e8ba4c Updating the template engine version to a version that depends on 1.6.0 and updating our build scripts to allow for a commit count override. 2017-01-26 20:44:31 -08:00
Livar
29ad4a25ec Merge branch 'rel/1.0.0' into bump_sdk 2017-01-26 19:12:20 -08:00
Livar
225b700173 Merge branch 'rel/1.0.0' into bump_sdk 2017-01-26 17:41:35 -08:00
Piotr Puszkiewicz
b4b4fa64fe Bump MSBuild to 15.1.0-preview-000539-01 2017-01-26 17:04:50 -08:00
jonsequitur
090c8e2e09 hoist CoreCLRRid definition to Prepare.targets 2017-01-26 14:48:42 -08:00
jonsequitur
d25f2a11d6 remove rid for Microsoft.DotNet.Cli.Utils test package build 2017-01-26 14:48:42 -08:00
jonsequitur
a14195f76d hoist task batching to target batching 2017-01-26 14:48:42 -08:00
jonsequitur
d63e0dd74a reduce abstraction in building test packages 2017-01-26 14:48:41 -08:00
jonsequitur
473e28c26b remove tool_csc cleanup 2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
add5f72573 Simplify desktop test packaging 2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
e0f46f9de4 add missing suffix component 2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
e089f8753e Account for NuGet/Home#4404 2017-01-26 14:48:41 -08:00
jonsequitur
4985804ba2 update Roslyn to 2.0.0-rc4-61325-08 2017-01-26 14:48:41 -08:00
jonsequitur
89ff57f51b only build desktop-and-portable TestPackage on Windows 2017-01-26 14:48:41 -08:00
jonsequitur
f66dbdb4b4 dotnet-desktop-and-portable.csproj to netcoreapp1.1 2017-01-26 14:48:41 -08:00
jonsequitur
25e3395684 dotnet-desktop-and-portable.csproj to netcoreapp1.0 2017-01-26 14:48:40 -08:00
Piotr Puszkiewicz
cc30bdde8a Make Deb tests test Deb 2017-01-26 14:48:40 -08:00
jonsequitur
bed3d974d6 add netcoreapp1.1 to Ubuntu installer 2017-01-26 14:48:40 -08:00
jonsequitur
3cba07288d remove redundant ToolPath setting 2017-01-26 14:48:40 -08:00
jonsequitur
0c80992384 move additional tests to netcoreapp1.1 2017-01-26 14:48:40 -08:00
jonsequitur
d55be626a9 netcoreapp1.1 fixes 2017-01-26 14:48:39 -08:00
Eric Erhardt
0073fc8534 Update CLI to run on netcoreapp1.1. 2017-01-26 14:48:39 -08:00
Eric Erhardt
6cb4b27ebb Make Deb tests test Deb 2017-01-26 14:52:55 -06:00
Eric Erhardt
f6b0196b0f Turn off multi-proc building of the test .sln to work around "cannot access file becuase it is being used by another process" errors. 2017-01-26 07:29:00 -06:00
Eric Erhardt
d4153815d5 Update the CLI to netcoreapp2.0. 2017-01-26 07:28:59 -06:00
Livar Cunha
6af1648543 Bumping the SDK version to 1.0.0-alpha-20170123-1. 2017-01-25 10:33:38 -08:00
Eric Erhardt
15930fac0f Fix build with latest stage0. 2017-01-24 17:53:19 -06:00
Eric Erhardt
e0d2bba7db Fix build with latest stage0. 2017-01-24 14:42:09 -06:00
Piotr Puszkiewicz
7c62621b8f Merge branch 'rel/1.0.0-rc3' into rel/1.0.0-rc3 2017-01-24 03:07:49 -08:00
Piotr Puszkiewicz
f4f325f1d5 Cleanup 2017-01-24 02:36:04 -08:00
Piotr Puszkiewicz
131c63ae27 Generate lzma nuget.config when needed 2017-01-24 02:30:24 -08:00
Piotr Puszkiewicz
ad8710decc SDK 20170123-1 (#5434)
* Revert "Merge pull request #5362 from dotnet/ragrawal/updatesdktrial"

This reverts commit 4e0b465093.

* bump SDK to 20170123-1
2017-01-24 01:14:35 -08:00
Mike Lorbetske
872e96cfe2 Update version of Microsoft.AspNetCore.Mvc 2017-01-23 20:21:58 -08:00
Arun Mahapatra
aa0359cd9a Insert test platform v15.0.0-preview-20170123-02 (#5426)
* Insert test platform v15.0.0-preview-20160120-03.

Remove OutputType from test project templates since it is
automatically determined by Microsoft.NET.Test.Sdk.

* Update testplatform v15.0.0-preview-20170123-02.
2017-01-23 13:54:08 -08:00
Eric Erhardt
1950ef5e17 Merge rel/1.0.0 into master 2017-01-23 09:57:56 -06:00
Piotr Puszkiewicz
1dfee9ead8 [WIP] Reduce test target complexity [and running time] (#5403)
* Reduce test target complexity [and running time]

* WiP

* Enable building tests via solution

Remove deprecated tests
Make Microsoft.DotNet.Tools.Tests.Utilities portable-only
Remove MSI tests from the solution as they are the only  tests that currently require dekstop.

* Enable building of tests

* Move migration tests to TA to allow them to self-restore

* Reduce project nesting and test directory name
2017-01-22 14:40:00 -08:00
Mike Lorbetske
8ac7312fa3 Take the latest WebSDK version to absorb a publish output directory change (#5409) 2017-01-20 23:03:03 -08:00
Piotr Puszkiewicz
dd59e2ce97 Merge pull request #5130 from blackdwarf/slntest
Introducing solution file for test projects
2017-01-19 16:12:38 -08:00
Piotr Puszkiewicz
05956f6efa Merge branch 'rel/1.0.0-rc3' into ragrawal/updatesdktrial 2017-01-18 13:41:50 -08:00
Krzysztof Wicher
1a20d7f82c Merge remote-tracking branch 'github/rel/1.0.0-rc3' into rel/1.0.0 2017-01-18 12:38:11 -08:00
Zlatko Knezevic
e365eb7591 Responding to PR feedback 2017-01-18 12:04:18 -08:00
Zlatko Knezevic
20b06d1f21 Adding back a \n 2017-01-17 22:58:34 -08:00
Piotr Puszkiewicz
964f0177d8 20170117-4 2017-01-17 16:33:36 -08:00
Zlatko Knezevic
d93b7abca0 Merge branch 'rel/1.0.0' into slntest 2017-01-17 12:53:44 -08:00
Rohit Agrawal (NUGET)
337d579949 update nuget and sdk to run a trial build 2017-01-17 11:08:17 -08:00
Piotr Puszkiewicz
61b7841087 bump core sdk to 1.0.0-alpha-20170117-1 (#5358) 2017-01-16 20:02:02 -08:00
Piotr Puszkiewicz
b312fbb176 Bump SDK to 20170114-3 (#5324)
* Bump SDK to 20170114-3

* bump to 20170115-2
2017-01-14 19:52:02 -08:00
Rainer Sigwald
7bc1bd4e7d Update msbuild to 15.1.0-preview-000523-01 (#5323) 2017-01-14 13:55:08 -08:00
Piotr Puszkiewicz
db2282a055 Update Microsoft.DotNet.Cli.DependencyVersions.props (#5322) 2017-01-13 23:53:08 -08:00
Piotr Puszkiewicz
20fa03e37f Bump SDK to 1.0.0-alpha-20170113-2 (#5313)
* Bump SDK to 1.0.0-alpha-20170113-2

* Updating the Web.SDK to 1.0.0-alpha-20170113-2-221

* Updating the web SDK to 1.0.0-alpha-20170114-1-223
2017-01-13 22:10:56 -08:00
Livar Cunha
8c2e7c9f01 Merge branch 'rel/1.0.0-rc3' into merge_rc3
* rel/1.0.0-rc3:
  Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped.
  Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation
  Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list.
  Adding a few more packages that were not in the manifest and moving some tests around.
  Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one.
  Adding ranges to the source mappings so that we can specify the origin should match this range and migrate to that version. We use this to handle LTS/FTS migration and will use that for the LTS uplift.
  Migration: do not inject built in compile includes that the SDK does
  Update msbuild to 15.1.0-preview-000522-02
  Migration: Do not add RIDs for Library projects (#5279)
  Use a separate env variable to control uploading the lzma archive. We only want OSX to publish the archive, because turns out that windows published archives are not used by unix based oses.
  Fix the download of the LZMA archive on dev machines and in Jenkins CI.
2017-01-13 14:08:31 -08:00
Zlatko Knezevic
75dc96be2a Merge branch 'rel/1.0.0' into slntest 2017-01-12 23:00:41 -08:00
Livar
a442449c55 Updating the branding on rel/1.0.0 to rc4. (#5267) 2017-01-12 13:14:57 -08:00
Piotr Puszkiewicz
7608f2d288 Update msbuild to 15.1.0-preview-000522-02 2017-01-11 23:58:51 -08:00
Piotr Puszkiewicz
c0b73e4b5f Merge branch 'rel/1.0.0' into slntest 2017-01-11 17:37:46 -08:00
Livar Cunha
420a6e9a66 Use a separate env variable to control uploading the lzma archive. We only want OSX to publish the archive, because turns out that windows published archives are not used by unix based oses. 2017-01-11 14:45:25 -08:00
Eric Erhardt
408b36f509 Fix the download of the LZMA archive on dev machines and in Jenkins CI. 2017-01-11 14:45:24 -08:00
PiotrP
c008e85f6a revert rc3->preview5 2017-01-11 13:18:44 -08:00
PiotrP
9008aaff85 merge RC3 into rel/1.0.0 2017-01-11 13:03:09 -08:00
Piotr Puszkiewicz
0bd6303f47 Restore debian test before running it (#5272) 2017-01-11 10:53:26 -08:00
Eric Erhardt
82317c7a0a Merge pull request #5257 from eerhardt/UpdateNuGet
Update NuGet to 4.0.0-rc3-2193 to bring in new TFMs for netstandard/netcoreapp 2.0
2017-01-11 10:45:45 -06:00
Eric Erhardt
4b856a785c Update NuGet to 4.0.0-rc3-2193 to bring in new TFMs for netstandard/netcoreapp 2.0. 2017-01-11 09:45:40 -06:00
Livar
4b82852d56 Updating the version of msbuild to 15.1.0-preview-000516-03 (#5266)
* Updating the version of msbuild to 15.1.0-preview-000516-03

* Remove test that assumes props/targets imports

The test ItAddsRefBetweenImports validated that the MSBuild XML model contained new project references between the props and targets imports. While useful be fore the SDK attribute, the test no longer adds value since the SDK is added implicitly, guaranteeing it wraps the remaining project contents.

* Move MSBuild to 15.1.0-preview-000509-03

This is the last msbuild version prior to the change of MSBuild's dependencies to include .NET 1.1 components.

* Move MSBuild invocations to use dirs.props/dirs.tasks

* Put back the test targets. We'll unify later.

* Remove dirs.props props from templates msbuild invocation
2017-01-11 01:49:22 -08:00
Piotr Puszkiewicz
19f18a291f Merge branch 'rel/1.0.0' into slntest 2017-01-11 01:17:52 -08:00
Piotr Puszkiewicz
203a28beb7 Merge branch 'rel/1.0.0' into NuGetDependencyVersions 2017-01-11 00:43:07 -08:00
Mike Lorbetske
ad6fab0a15 Synchronize templates with new3, add global.json (#5244)
* Synchronize templates with new3, add global.json

* Add runtimeconfig.template.json for web

Removes global.json write during template creation

* Remove global.json check from the test

* making templates the same as new3 templates

* Fix broken PrivateAssets, content update

Sets OutputType as appropriate
Alphabetizes package references

* Rollback browserlink version to 1.0.0

* Downgrade 1.1.0 of browserlink to 1.0.0 as well

* Add newline to the end of the console project
2017-01-10 22:58:30 -08:00
Eric Erhardt
9d2976863b Merge branch 'rel/1.0.0' into NuGetDependencyVersions 2017-01-10 21:59:30 -06:00
Eric Erhardt
fd8f9b1bde Fix the download of the LZMA archive on dev machines and in Jenkins CI. 2017-01-10 21:10:40 -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
Krzysztof Wicher
0be2f7c1fa update msbuild version to 15.1.0-preview-000509-03 (#5249) 2017-01-10 17:46:05 -08:00
Rohit Agrawal
00425c3d34 Update Microsoft.DotNet.Cli.DependencyVersions.props 2017-01-10 16:46:32 -08:00
Livar
16e87076a6 Merge branch 'rel/1.0.0-rc3' into updatenugetrc3 2017-01-10 16:08:49 -08:00
Eric Erhardt
36d03ce4ce Fix up merge of cherry-picking 'Fixing the test packages preparation. First, allows it to run independently. Second, it actually points to packages produced by the repo.' 2017-01-10 17:29:46 -06:00
Livar Cunha
f3945b867d Fixing windows test. 2017-01-10 16:50:08 -06:00
Livar Cunha
df57e5dbf6 Addressing code review comments. 2017-01-10 16:48:46 -06:00
Livar Cunha
d3157de6ee Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it. 2017-01-10 16:48:28 -06:00
Livar Cunha
4fe36fd1e5 Fixing the test packages preparation. First, allows it to run independently. Second, it actually points to packages produced by the repo. 2017-01-10 16:48:17 -06:00
Livar Cunha
8a6faa2dca Fixing windows test. 2017-01-10 14:12:04 -08:00
Rohit Agrawal (NUGET)
3ecdc62089 update nuget rc3 dependencies and update sdk 2017-01-10 11:24:27 -08:00
Livar Cunha
e795e12a16 Addressing code review comments. 2017-01-10 10:47:10 -08:00
Livar Cunha
e71c58c156 Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it. 2017-01-10 10:43:05 -08:00
Eric Erhardt
0f2c305dc1 Add NuGet version to DependencyVersions.props. 2017-01-10 10:48:37 -06:00
Eric Erhardt
5035320247 Add NuGet version to DependencyVersions.props. 2017-01-10 10:43:14 -06:00
Livar Cunha
c691f6d7fe Fixing the test packages preparation. First, allows it to run independently. Second, it actually points to packages produced by the repo. 2017-01-09 16:49:57 -08:00
Livar Cunha
3220b14248 Updating the branding of the CLI to 1.0.0-rc3 2017-01-09 13:59:03 -08:00
Livar
87e9815a25 Merge pull request #5234 from harshjain2/tpv2update
Updated version of Test Platform
2017-01-07 14:44:01 -08:00
Livar
f2f37729b8 Merge pull request #5235 from eerhardt/PopulateNuGetCache11
Populate nuget cache for shared fx and asp.net 1.1
2017-01-07 11:31:54 -08:00
Harsh Jain
0222e8e850 merged to resolve conflicts 2017-01-07 20:40:50 +05:30
Rohit Agrawal
5bbfbfeeed update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5 (#5214)
* update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5

* Modifying restore project.json to use the project.json stage0 CLI instead of restore-projectjson command.

* add a nuget dependency so migrated project has packageref and generates an assets file on restore
2017-01-06 16:28:04 -08:00
Eric Erhardt
0cfc54c377 First time experience populating the NuGet cache with 1.1 packages. 2017-01-06 17:45:34 -06:00
Mike Lorbetske
decec5f8da First step to ingest template engine (#5065)
* First step to ingest template engine

Please do not merge yet
@piotrp @seancpeters @livarocc

* Localization

* Attempt to get a build going

Rename program.cs to New3Command.cs
Move TableFormatter into its own file
Consume template engine packages version 1.0.0-beta1-20161218-24
Temporarily add MyGet templating feed so that package restore will work

* Update ExtendedCommandParser

Make short form args prefer longer runs of characters in the source
parameter before falling back to p:shortname syntax
Change scoping for a few methods to get rid of inconsistent visiblity
errors

* Fix package installation wildcards

* Cleanup New3Command, fix review issue, bump version, sorting for template list

* Installation, loc fix, help formatting

* Use latest TemplateEngine packages

* New3 unit tests

* Fixed formatting on csproj files

* Add the build steps to add templates to the layout

* Change tests slightly to make comparisons easier

Also fixes the wrong flag getting passed to set language

* Fixes for 127, 128, 130, 131 - help display

* Sync to latest TemplateEngine version

Absorbs new search logic

* All tests passing

Cleaner New3Command
Support for project/item template contexts

* Try to make tests more durable

* Disable test parallelization for dotnet-new tests

* Update web SDK and template engine versions

* Remove AI package feed

* Simplify CLI interface to Template Engine

* Fix host identifier and update to latest packages

* Update template engine & Web SDK versions

* Fix template engine version

* Remove UsingTask and redeclaration of property
2017-01-06 14:48:27 -08:00
Harsh Jain
effee47d38 Version update for test platform. 2017-01-07 01:04:00 +05:30
Eric Erhardt
12f28a6019 Merge pull request #5225 from eerhardt/AddSharedFx11
Install Shared Framework 1.1 when installing the CLI
2017-01-06 11:21:14 -06:00
Eric Erhardt
a211353e52 Fix TestSdkDeb by installing the AdditionalSharedHost installer. 2017-01-05 22:25:58 -06:00
Eric Erhardt
80919ddc12 Work around MSBuild issue with using %AD at the beginning of an Include. 2017-01-05 21:05:06 -06:00
Livar
80f2ef6533 Merge pull request #5181 from harshjain2/clirunsettings
Added ability to pass runsettings as commandline parameters after --
2017-01-05 16:22:08 -08:00
Eric Erhardt
48ec34e7b4 DEB support for installing shared fx 1.1. 2017-01-05 18:06:16 -06:00
Eric Erhardt
6106cae066 PKG support for installing shared fx 1.1. 2017-01-05 17:30:08 -06: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
Eric Erhardt
63669d5129 MSI support for installing shared fx 1.1. 2017-01-05 15:39:35 -06:00
Eric Erhardt
e5e11c19c2 Download and extract shared framework 1.1. This initial change gets 1.1 into the archive installers. Still need to bring it into the native installers as well. 2017-01-05 15:03:56 -06:00