mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6850 commits 41 branches 190 tags 95 MiB
Commit graph

1046 commits

Author SHA1 Message Date
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
dotnet-bot
2caa293a51 Update CoreSetup to preview1-001913 2017-04-04 18:04:37 +00:00
Eric Erhardt
b00384f497 Merge pull request #6234 from eerhardt/SelfContained 
Add --self-contained to publish.
 2017-04-04 12:03:09 -05:00
Livar
8e02c20a30 Merge pull request #6232 from dotnet/UpdateMSBuild 
Update MSBuild to 15.2.0-preview-000093-02
 2017-04-03 23:31:56 -07:00
Livar
34f7df0763 Merge pull request #6209 from livarcocc/first_run_fallback_folder 
First run fallback folder
 2017-04-03 23:23:29 -07:00
Livar
6187409418 Merge branch 'master' into UpdateMSBuild 2017-04-03 22:25:27 -07:00
Livar
b207165c67 Merge pull request #6231 from dotnet/websdkversion 
Updating the websdk version
 2017-04-03 22:24:27 -07:00
Livar Cunha
3d0089552c Fixing failures in tests when the user has a fallbackfolder setup on this machine already. These failures are again due to the fact that --packages are not populated when the packages are found in the fallback folder. 2017-04-03 22:15:40 -07:00
dotnet-bot
5e5d209115 Update CoreSetup to preview1-001907 2017-04-03 23:43:58 +00:00
Eric Erhardt
ab15200500 Add --self-contained to publish. 
This flows to the $(SelfContained) property added in https://github.com/dotnet/sdk/pull/1053
 2017-04-03 18:17:08 -05:00
Eric Erhardt
5e15b5f5c5 Update MSBuild to 15.2.0-preview-000093-02 2017-04-03 16:21:38 -05:00
Vijay Ramakrishnan
eb5ec51919 Updating the websdk version 2017-04-03 10:46:03 -07:00
Eric Erhardt
4145c3304d Merge pull request #6181 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to beta-001863 (master)
 2017-03-31 20:57:51 -05:00
Eric Erhardt
0d39a1656d Update CoreSetup to preview1-001887-00 2017-03-31 18:31:27 -05:00
Eric Erhardt
527ab6b47a Update CoreSetup to preview1-001875-00 2017-03-30 15:54:01 -05:00
Eric Erhardt
56f2652406 Fixing the reference to dotnet-deb-tool to be correct. 
No more using * versions.  Only specify the version in a single place.
 2017-03-30 14:39:54 -05:00
Livar Cunha
a46237784e Modified the build script to generate the lzma archive without the nupkgs. Modified the configurer to upsert NuGet.Config with the fallback folder info and to extract the fallback folder. Added unit tests for all this. Next step: update E2E tests. 2017-03-30 00:11:17 -07:00
Eric Erhardt
bbd388d328 Fix crossgen location on linux machines. 
Microsoft.NETCore.App no longer pulls in distro-specific runtime packages on linux. Instead, it uses the portable 'linux-x64' runtime.
 2017-03-29 17:48:22 -05:00
dotnet-bot
eecd983d80 Update CoreSetup to beta-001863 2017-03-29 21:29:20 +00:00
mlorbetske
d8e1943c49 Take newer version of the engine 2017-03-28 20:53:27 -07:00
Mike Lorbetske
be5c70cd30 Use a build that exists 2017-03-28 09:17:51 -07:00
Mike Lorbetske
3d6833b5f0 Update engine version 2017-03-28 08:17:01 -07:00
Mike Lorbetske
4c2435eeb9 Update engine version, fix test 2017-03-27 23:46:40 -07:00
Mike Lorbetske
19f89a2f73 Update engine version to get some more information about the CI failures 2017-03-27 21:22:49 -07:00
Mike Lorbetske
988f0c665d Take newer version of template engine 2017-03-27 20:31:17 -07:00
Mike Lorbetske
9bb88734ea Update to template engine build 166 and updates to 2.0 templates 2017-03-27 17:46:32 -07:00
Livar
e09c33400c Merge pull request #6138 from livarcocc/tool_fallback_folder 
Switched to using a FallbackPackagePathResolver to find the tool dll
 2017-03-27 10:57:55 -07:00
Livar
a0c0084359 Merge pull request #6149 from eerhardt/UseLinuxRuntime 
Use the portable `linux-x64` runtime when building on Linux.
 2017-03-24 16:19:04 -07:00
Nick Guerrera
fcd3c149f8 Merge pull request #6136 from nguerrera/vs-version-props 
Package bundled version props in to a VS insertion nupkg
 2017-03-24 15:56:04 -07:00
Eric Erhardt
a97b572e49 Use the portable linux-x64 runtime when building on Linux. 2017-03-24 16:19:52 -05:00
Eric Erhardt
7bfc51f2b1 Format BundledRuntimes.props to use consistent whitespace. 2017-03-24 14:22:34 -05:00
Livar Cunha
10e743e8e5 Switched to using a FallbackPackagePathResolver to find the tool dll, because now with Fallback folders, we can have the tool dll in the fallback folder but its assets file in the user nuget cache. This happens because Nuget never writes to the fallback folder, including the tool's assets file that it generates during restore. 2017-03-24 12:17:27 -07:00
Nick Guerrera
5e26d0f160 Package bundled version props in to a VS insertion nupkg 2017-03-24 11:11:31 -07:00
Matt Ellis
aeed60ded1 Update OSX CoreCLR RID 
Since Microsoft.NETCore.App 2.0 will only support 10.12 and later, the
RID in the runtime package has changed to osx.10.12. We need to update
so we pick up crossgen from the right place.
 2017-03-23 17:18:04 -07:00
dotnet-bot
438d9de6ce Update CoreSetup to beta-001834 2017-03-23 23:58:21 +00:00
Nick Guerrera
e644058c0e Merge branch 'master' into version-props 2017-03-23 13:59:47 -07:00
Justin Emgarten
e1cb32a1f2 Updating CLI_NETSDK_Version and CLI_NuGet_Version 2017-03-22 19:51:00 -07:00
Nick Guerrera
a5051a0aff Generate bundled version props 2017-03-22 15:28:39 -07:00
Nick Guerrera
4abb4d97a9 Update dotnet/sdk version 2017-03-21 21:30:27 -07:00
jonsequitur
4effd9354c merge 2017-03-21 11:57:08 -07:00
Rama krishnan Raghupathy
2fb9033970 Merge pull request #6085 from ramarag/apphost 
Using Apphost.exe for standalone apps
 2017-03-20 19:21:04 -07:00
Rama Krishnan Raghupathy
a48f3a6bbf Using Apphost.exe for standalone apps 2017-03-20 18:06:48 -07:00
Livar Cunha
ff294c312a Fixing the moniker for the new rids. 2017-03-20 14:37:29 -07:00
Livar Cunha
df496d0959 Fixing the extra distros. 2017-03-20 12:41:47 -07:00
Livar
ae6c0d17dc Merge pull request #5990 from livarcocc/enable_more_distros 
Enable more distros
 2017-03-20 09:36:24 -07:00
jonsequitur
c85492bd48 merge master 2017-03-19 17:09:05 -07:00
Livar Cunha
bb178a5133 Updated tests to the new appropriate TFM 1.1, since we need a shared runtime besides 2.0 in the new distros. Once we have vstest for 2.0 then we won't need it anymore. 2017-03-17 20:32:51 -07:00
Livar Cunha
cfd0874c96 Modified test assets and added the new rids back as badges and CI. Still need to update tests. 2017-03-17 20:32:50 -07:00
dotnet-bot
1a767d4238 Update CoreSetup to beta-001791 2017-03-17 20:56:42 +00:00
dotnet-bot
7cdef98e18 Update CoreSetup to beta-001783 2017-03-17 01:32:18 +00:00
Livar
5476ad9cf8 Merge pull request #6053 from smadala/tp-redist-02 
Netcoreapp2.0 targetted TestPlatform
 2017-03-16 14:56:23 -07:00
Satya Madala
d42602e377 add Testplatform netcore2.0 targetted and vstest myget feed 2017-03-16 23:19:12 +05:30
dotnet-bot
ff27937d73 Update CoreSetup to beta-001776 2017-03-16 00:55:37 +00:00
dotnet-bot
8236618e42 Update CoreSetup to beta-001763 2017-03-15 00:28:21 +00:00
Livar Cunha
7299ec1f0a Updating the CLI branding to 1.0.2 and updating the msbuild version. 2017-03-14 17:14:53 -07:00
dotnet-bot
3fd60e911f Update CoreSetup to beta-001747 2017-03-14 04:59:57 +00:00
dotnet-bot
5ac4287d5c Update CoreSetup to beta-001745 2017-03-13 18:04:55 +00:00
jonsequitur
ae01694167 Merge branch 'tab-completion' of https://github.com/jonsequitur/cli into tab-completion 2017-03-11 09:45:19 -08:00
Jon Sequeira
6e3a55e872 update CliCommandLine version 2017-03-10 18:21:58 -08:00
Piotr Puszkiewicz
23d4fb32f3 Merge remote-tracking branch 'jonsequitur/tab-completion' into tab-completion 2017-03-10 17:37:26 -08:00
Jon Sequeira
34d9cbf863 new CliCommandLine version 2017-03-10 17:11:19 -08:00
Piotr Puszkiewicz
df3c08b645 Pass through test options to msbuild 2017-03-10 13:49:49 -08:00
dotnet-bot
4a57564f08 Update CoreSetup to beta-001737 2017-03-10 20:44:00 +00:00
Piotr Puszkiewicz
0df2462344 Merge remote-tracking branch 'dotnet/master' into tab-completion 2017-03-10 12:03:01 -08:00
dotnet-bot
5430d155cc Update CoreSetup to beta-001728 2017-03-10 16:37:40 +00:00
jonsequitur
58bf70a476 merge 2017-03-09 18:36:05 -08:00
Eric Erhardt
43263cc9c3 Add logging for publishing src\redist.csproj 2017-03-09 16:30:29 -06:00
dotnet-bot
86f539e420 Update CoreSetup to beta-001711 2017-03-09 19:21:49 +00:00
Eric Erhardt
81c2d4605e Merge pull request #5957 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to beta-001697 (master)
 2017-03-08 22:05:32 -06:00
Justin Goshi
113924eebd Add support to build linux portable (#5938) 
* Add support to build with the linux portable

* Pass targets to run for the linux portable

* Address PR comments

* Update the bootstrapper version

* Address the PR comments for improving the help text

* Fixing permissions
 2017-03-08 13:37:06 -10:00
dotnet-bot
e246be9f64 Update CoreSetup to beta-001697 2017-03-08 20:31:52 +00: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
Livar
22816d7958 Merge pull request #5945 from piotrpMSFT/piotrpMSFT/infra/00prefix 
Fix RHEL builds
 2017-03-08 08:36:11 -08:00
dotnet-bot
dba212b21b Update CoreSetup to beta-001689 2017-03-08 15:53:17 +00:00
Livar
8df1812e7b Merge pull request #5946 from dotnet/update-sdk 
Update .NET SDK
 2017-03-07 20:42:18 -08:00
Eric Erhardt
f4090e2438 Merge pull request #5939 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to beta-001683 (master)
 2017-03-07 18:55:10 -06:00
Daniel Plaisted
b0891781cb Update .NET SDK 2017-03-07 13:38:00 -08:00
Unknown
bd97d02937 Fix RHEL issue 2017-03-07 13:22:42 -08:00
Unknown
d313cb4012 Change suffix to preview1 2017-03-07 12:05:42 -08:00
Unknown
eaa5049859 Force string comparison 2017-03-07 12:02:47 -08:00
dotnet-bot
0f4c77dbbd Update CoreSetup to beta-001683 2017-03-07 19:48:43 +00:00
Jon Sequeira
1ed5b420a9 don't split on : or = in restore command parse 2017-03-07 11:28:35 -08:00
Unknown
97e3767bd7 use PadLeft 2017-03-07 11:04:18 -08:00
Unknown
06ab197be5 Add back 000000 padding to commit count 2017-03-07 10:49:28 -08:00
Livar Cunha
ab28591c10 Replacing hard coded references to shared framework version. 2017-03-06 21:25:42 -08:00
dotnet-bot
44b6bbdba3 Update CoreSetup to beta-001675 2017-03-06 16:52:17 +00:00
Livar
b42697ff09 Merge pull request #5917 from eerhardt/FixVersionsRepoUpdater 
Fix UpdateVersionsRepo to always write the files correctly.
 2017-03-03 20:31:05 -08:00
Eric Erhardt
21471aa956 Fix UpdateVersionsRepo to always write the files correctly. 
We were only building nupkgs on windows, which meant if a non-windows machine was the last leg to finish, we were writing a blank file to the versions repo.

Fix #4399
 2017-03-03 21:43:38 -06:00
dotnet-bot
74defebb5a Update CoreSetup to beta-001663 2017-03-04 03:34:35 +00:00
Eric Erhardt
0e0b59f910 Merge pull request #5909 from dotnet/UpdateSDK 
Update NET.Sdk to 1.1.0-alpha-20170303-2
 2017-03-03 19:56:16 -06:00
Rama Krishnan Raghupathy
94dab4559a Merge remote-tracking branch 'upstream/master' into UpdateSDK 2017-03-03 14:27:05 -08:00
Livar
70c65160f6 Merge pull request #5892 from livarcocc/merge_rel101_into_master 
Merge rel101 into master
 2017-03-03 14:11:06 -08:00
Parallels
a5c7ac12f7 Fixing a couple more merge issues regarding deb generation. 2017-03-03 13:30:57 -08:00
Daniel Plaisted
4b9c4efc3f Update versions of MSBuild and NuGet 2017-03-03 12:33:56 -08:00
Parallels
f42599dec2 Fixing ubuntu deb generation. 2017-03-03 11:13:41 -08:00
Eric Erhardt
7fca740af5 Update NET.Sdk to 1.1.0-alpha-20170303-2 2017-03-03 10:11:30 -06:00
Livar Cunha
c667ec7702 Fixing a bad merge on Installer.DEB.proj. 2017-03-03 01:08:58 -08:00
Piotr Puszkiewicz
a07ebe2e7b Merge remote-tracking branch 'refs/remotes/dotnet/master' 
Conflicts:
	TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
	TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
	TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
	TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
	TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
	TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
	TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
	build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs
 2017-03-02 23:49:01 -08:00
Piotr Puszkiewicz
5048f65703 Merged branch master into piotrpMSFT/infra/CodeCleanup 2017-03-02 21:56:50 -08:00
Livar Cunha
103833fd34 Updating the version of the TestFramework which fixed the tests for dotnet test and vstest and actually managed to move the projects used there to 2.0. So, only test packages should remain 1.0. 2017-03-02 21:43:06 -08:00
Piotr Puszkiewicz
a5862752c9 Version as Metadata in build/ 2017-03-02 19:50:46 -08:00
Piotr Puszkiewicz
fbb75e1a47 Remove task usage in commitcount calculation 2017-03-02 18:46:08 -08:00
Livar Cunha
23e39c10b7 Moving as many of our test assets to netcoreapp2.0 as possible. I believe the only ones missing at the test packages, because tools always target 1.0. And the other ones are VSTestDotNetCore and VSTestXUnitDotNetCore, because we can't run tests on 2.0 yet. Or, when I tried it failed. I may came back to try this out later. 2017-03-02 17:41:21 -08:00
Livar Cunha
792cc7bf2a Fixing a couple of wrong merges. 2017-03-01 22:34:08 -08:00
Livar Cunha
3a9525b5ac Merge branch 'rel/1.0.1' into merge_rel101_into_master 
* rel/1.0.1: (66 commits)
  Update LZMA license with correct text
  Bump to 2.0.0-rc5-61427-04
  Remove duplicate installer suffix
  Add license text to LZMA SDK license notice
  Updating the SDK to 1.0.0-alpha-20170224-6
  Updating both platform abstractions and dependency model to 1.0.3.
  Bump Roslyn to 2.0.0-rc5-61424-02
  Update Stage0 to use the latest build.
  Update README with new distros.
  Back porting #5597 into rel/1.0.0
  Fixing the exclude pattern used by the Migration to exclude WEB SDK globs.
  Remove RID from test package creation
  Disable migrate and publish web app with content because CI does not have NPM
  Adding an E2E test for pack with content during migration.
  Fixing a failing test and adding a few more E2E tests around binplace content for migrated projects.
  Fix debian_config.json on ubuntu16.10
  Updating publish, pack and build of content to use None with Never/false/Never in their metadata for excluded items.
  Intermediate commit to get a WIP PR out. This adds the None Update with CopyToOutputDirectory set to Never.
  Switching the CopyToOutput for build and publish and the file for pack to use None Update instead of include. Also, fixed the exclude patterns for web apps.
  Do not migrate Content that is already included in the Web SDK for web apps.
  ...
 2017-03-01 20:50:42 -08:00
Eric Erhardt
b64068291b Remove OpenSUSE13 and Fedora23 since they are end of lifed. 2017-03-01 15:27:50 -06:00
Livar Cunha
94b79f4466 Updating the badge names that we use when checking if the build changed. Before, we were using an API to generate the OS names, now we are using msbuild OSName property, which names the OS differently. 2017-03-01 11:46:53 -08:00
Piotr Puszkiewicz
12fde69e86 Move remaining Publish actions to redist.csproj 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
eee7c7ed32 Move PDB removal to redist.csproj target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
283a80dff0 Move Symbols package creation to redist target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
28d83da782 Remove vbc in a target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
db35770913 Add back Windows condition 2017-02-28 19:30:43 -08:00
Piotr Puszkiewicz
664f089985 Reduce chmod 2017-02-28 18:16:51 -08:00
Piotr Puszkiewicz
b2429da437 Merge pull request #5869 from dotnet/dev/jgoshi/fixBrokenPublish 
Fix broken publish for official builds
 2017-02-28 14:34:32 -08:00
Piotr Puszkiewicz
52af661ca2 Merge pull request #5866 from piotrpMSFT/piotrpMSFT/infra/crossgentarget 
Simplify crossgen script and move to dedicated target in redist.csproj
 2017-02-28 14:33:58 -08:00
Piotr Puszkiewicz
88ab21600d Remove RID from package creation 2017-02-28 12:00:05 -08:00
Justin Goshi
9ffa76eab4 Fix broken publish for official builds 2017-02-28 10:16:52 -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
Eric Erhardt
37c6842e00 Update NET.Sdk to 1.1.0-alpha-20170228-1. 2017-02-27 23:24:02 -08:00
Eric Erhardt
c1da263d40 Update NuGet to 4.0.1-beta-2321. 
Update NET.Sdk to 1.1.0-alpha-20170227-1
 2017-02-27 23:23:37 -08:00
Eric Erhardt
93f8157a04 Update NET.Sdk to 1.1.0-alpha-20170217-4 2017-02-27 23:21:16 -08:00
Piotr Puszkiewicz
15f1582945 Move Test to use build output where possible. 2017-02-27 20:45:26 -08:00
Piotr Puszkiewicz
8ca21b67f9 Add relative paths, add logs by default 2017-02-27 17:19:39 -08:00
Piotr Puszkiewicz
5d193e8b39 Merge conflicts 2017-02-27 17:13:13 -08:00
Piotr Puszkiewicz
b1787426c0 Also move nupkg contentFiles 2017-02-27 17:11:37 -08:00
Piotr Puszkiewicz
43266d2d9a Move publishing static MSBuildExtensions to redist.csproj 2017-02-27 17:11:03 -08:00
Piotr Puszkiewicz
7ea5bf478e Merge pull request #5861 from dotnet/dev/jgoshi/removeDuplicateProps 
Remove duplicate properties
 2017-02-27 16:40:31 -08:00
Piotr Puszkiewicz
e92f9dfe0d Bump to 2.0.0-rc5-61427-04 2017-02-27 15:07:54 -08:00
Piotr Puszkiewicz
79704cc074 Merge branch 'rel/1.0.1' into piotrpMSFT/bump/Roslyn 2017-02-27 13:15:06 -08:00
Eric Erhardt
c66d3bb6ad Update NuGet version with latest netstandard2.0 build 2017-02-27 14:50:39 -06:00
Justin Goshi
61c1e3e104 Remove duplicate properties 2017-02-27 11:06:44 -08:00
Piotr Puszkiewicz
0a6deabcce Enable multi-proc build of test sln. 2017-02-27 10:34:59 -08:00
Piotr Puszkiewicz
b55b5ad033 Remove duplicate installer suffix 2017-02-27 10:21:42 -08:00
Eric Erhardt
ab887ec024 Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101 2017-02-25 14:30:53 -06:00
Eric Erhardt
23392fa3c3 Merge branch 'rel/1.0.0' into piotrpMSFT/bump/Roslyn 2017-02-25 13:12:35 -06:00
Livar Cunha
9210b84a98 Updating the SDK to 1.0.0-alpha-20170224-6 2017-02-24 15:56:59 -08:00
Livar Cunha
b3da712d3d Updating both platform abstractions and dependency model to 1.0.3. 2017-02-24 14:52:05 -08:00
Unknown
66be1db3fe Bump Roslyn to 2.0.0-rc5-61424-02 2017-02-24 14:11:35 -08:00
Justin Goshi
1b318510b2 Add back last empty line in BranchInfo.props 2017-02-24 10:36:07 -08:00
Justin Goshi
8279c16fa4 Merge branch 'master' into dev/jgoshi/removeGlobalProps 2017-02-24 10:34:23 -08:00
Justin Goshi
5bb7ca8112 Add back BranchInfo.props 2017-02-24 10:34:16 -08:00
Piotr Puszkiewicz
e2dcac0e4b Merge branch 'rel/1.0.1' into FixUbuntu1610 2017-02-24 01:22:49 -08:00
Unknown
3dc266f21c Remove RID from test package creation 2017-02-24 00:57:15 -08:00
Eric Erhardt
a7003763b7 Fix debian_config.json on ubuntu16.10 
When we only have a single shared framework, the python json parser throws an error since there is a hanging comma on the last property.

Fixing this by removing the comma when there is only a single Shared Framework dependency.
 2017-02-23 23:25:26 -06:00
Livar
16d1fe4c28 Merge branch 'rel/1.0.0' into update_sdk 2017-02-23 19:49:36 -08:00
Piotr Puszkiewicz
781326a0ad Merge branch 'rel/1.0.0' into tp-insert-15.0.0 2017-02-23 18:40:58 -08:00
Piotr Puszkiewicz
8fc6766785 Merge branch 'rel/1.0.1' into Merge100To101 2017-02-23 18:22:02 -08:00
Piotr Puszkiewicz
22fcc35797 Merge pull request #5820 from dotnet/dev/jgoshi/refactorPackage 
Refactor props in package directory
 2017-02-23 18:15:52 -08:00
Justin Goshi
74e343e111 First pass at cleaning up the global properties files 2017-02-23 17:07:26 -08:00
Mike Lorbetske
d9d5bb10cb Template update for test SDK version change 2017-02-23 14:13:27 -08:00
Matt Ellis
0f092f92c2 Don't look for Debian package dependencies when skipping installers 
Today, we always check to see if DebianPackageBuildDependencies are
present on the machine doing a build, because we will need them to
build the .deb files later on.

Since we now allow skipping of building packages, don't check for
these dependencies if we weren't going to use them.
 2017-02-23 14:11:11 -08:00
Justin Goshi
0ec5003d68 Forgot Installer.PKG.targets 2017-02-23 13:59:20 -08:00
Eric Erhardt
ace9526681 Merge remote-tracking branch 'refs/remotes/upstream/rel/1.0.0' 
Conflicts:
	README.md
	build/Microsoft.DotNet.Cli.Monikers.props
	test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
 2017-02-23 15:42:35 -06:00
Justin Goshi
d9e532a53d Fix the build break 2017-02-23 13:30:04 -08:00
Eric Erhardt
5227896d0f Fix Ubuntu16.10 BuildSdkDeb 
We need to replace a string with string.Empty in the debian .json file. Fixing ReplaceFileContents to support this scenario.
 2017-02-23 15:29:11 -06:00
Justin Goshi
43cf7be593 Try to fix the build break 2017-02-23 13:11:25 -08:00
Piotr Puszkiewicz
55b81e8a23 Merge pull request #5814 from piotrpMSFT/piotrpmsft/infra/removeCoreHost 
Remove corehost from CLI layout
 2017-02-23 12:40:21 -08:00
Justin Goshi
84e8b8580d Try the rename of the LayoutOutput directory 2017-02-23 12:28:57 -08:00
Justin Goshi
b86afddbd3 Try reverting Installer.DEB.targets to investigate the build break 2017-02-23 12:03:17 -08:00
Satya Madala
4c44e29ea0 TestPlatform branding changes: 15.0.0 2017-02-24 00:18:10 +05:30
Justin Goshi
2118c643d6 Refactor props in package directory 2017-02-23 10:37:48 -08:00
Piotr Puszkiewicz
9e4beca874 Merge pull request #5804 from dotnet/dev/jgoshi/refactorPublishTarget 
Refactor publish.target
 2017-02-23 10:13:47 -08:00
Justin Goshi
acc77e2a46 Address pr comments 2017-02-23 09:26:14 -08:00
Justin Goshi
08ffc78be6 Merge branch 'master' into dev/jgoshi/refactorPublishTarget 2017-02-23 09:01:44 -08:00
Piotr Puszkiewicz
56f9a84dfd Generate Version file before redist publish 2017-02-23 02:33:00 -08:00
Piotr Puszkiewicz
49dd6bcd7c Remove corehost from CLI layout 2017-02-23 01:36:43 -08:00
Livar Cunha
7f4f35db65 Adding the SDK version to the hash of the lzma archive, since the SDK has implicit package refs in it that will impact the archive when they change. 2017-02-23 01:13:58 -08:00
Piotr Puszkiewicz
7818348fc2 Move copying sharedfx to before publish of redist 2017-02-23 01:12:32 -08:00
Piotr Puszkiewicz
1199df1c05 Move tool deps file creation into redist.csproj 2017-02-22 22:47:11 -08:00
Piotr Puszkiewicz
dc1b97c4a1 Merge pull request #5806 from piotrpMSFT/piotrpMSFT/infra/HackFilesToCopy 
remove HackFilesToCopy
 2017-02-22 20:16:51 -08:00
Piotr Puszkiewicz
10750eb136 Merge pull request #5807 from piotrpMSFT/piotrpMSFT/infra/RoslynStaticPublish 
Enable Publishing Roslyn with Static Output Path
 2017-02-22 20:16:25 -08:00
Eric Erhardt
7036fa1aef Update dotnet-deb-tool-consumer to use the latest dotnet-deb-tool. 
The latest deb-tool will use the CLI's runtime, which is required on distros that don't have .NET Core 1.0 installed.
 2017-02-22 21:34:22 -06:00
Piotr Puszkiewicz
b9378b8a66 Merge pull request #5803 from dotnet/dev/jgoshi/refactorPublishDir 
Refactor props from publish directory
 2017-02-22 17:49:08 -08:00
Piotr Puszkiewicz
31f2410b4f Enable Publishing Roslyn with Static Output Path 2017-02-22 17:33:26 -08:00
Piotr Puszkiewicz
4d0dbdbb7f Cleanup 2017-02-22 17:05:49 -08:00
Piotr Puszkiewicz
1ed6c2cdac Fix spacing 2017-02-22 17:01:14 -08:00
Piotr Puszkiewicz
5a89b01459 Remove HackFilesToCopy 2017-02-22 16:57:32 -08:00
Piotr Puszkiewicz
84ead82037 RootProject property 2017-02-22 16:57:10 -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
Piotr Puszkiewicz
509cd0addb Merge branch 'rel/1.0.0' into tp-20170222-09 2017-02-22 16:47:08 -08:00
Piotr Puszkiewicz
4105138019 Merge branch 'rel/1.0.0' into tp-20170222-09 2017-02-22 16:33:51 -08:00
Justin Goshi
1f39e07909 Refactor props from publish directory 2017-02-22 16:19:56 -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
Piotr Puszkiewicz
3c8477ad1b Merge branch 'rel/1.0.0' into piotrpMSFT/issues/brandingUpdate100 2017-02-22 15:23:15 -08:00
Mike Lorbetske
6a26c5584a Pick up a newer version of templates carrying the latest test SDK changes 2017-02-22 14:04:17 -08:00
Justin Goshi
13dbdd1a4e Merge 2017-02-22 13:38:39 -08:00
Piotr Puszkiewicz
a0a7512d7b Merge pull request #5782 from dotnet/dev/jgoshi/refactorCrossgenTarget 
Refactor props in crossgen.target
 2017-02-22 13:19:27 -08:00
Eric Erhardt
996d458e30 Support Ubuntu16.10 installer 
Since Ubuntu16.10 doesn't have a 1.0 shared framework, only install the 1.1 shared framework.
 2017-02-22 15:18:45 -06:00
Eric Erhardt
916a19c493 Add support for Fedora 24, OpenSUSE 42.1 and Ubuntu 16.10 2017-02-22 15:13:02 -06:00
Justin Goshi
4442b45fef Try to fix spacing part 3 2017-02-22 11:08:16 -08:00
Justin Goshi
c51d129294 Try to fix spacing part 2 2017-02-22 11:06:57 -08:00
Justin Goshi
aff69fb324 Try to fix spacing 2017-02-22 11:03:11 -08:00
Justin Goshi
7b62dd1267 Address some of the PR comments 2017-02-22 10:52:50 -08:00
Justin Goshi
1d9a2e5da1 Merge branch 'master' into dev/jgoshi/refactorLzmaTarget 2017-02-22 10:21:22 -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
d828a08e60 Address PR comments 2017-02-22 09:25:06 -08:00
Justin Goshi
f7d77e3e54 Merge branch 'master' into dev/jgoshi/refactorTestTarget 2017-02-22 09:17:54 -08:00
Piotr Puszkiewicz
c5e7c3dd45 Merge pull request #5736 from dotnet/dev/jgoshi/morePropsRename 
Finish renaming props file to remove Microsoft.Dotnet.Cli prefix
 2017-02-22 09:15:20 -08:00
Arun Mahapatra
c4df7e5e2d Update TestPlatform to v15.0.0-preview-20170222-09. 2017-02-22 19:56:57 +05:30
Piotr Puszkiewicz
a1e9a5dfc4 PR feedback 2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
70b0a68038 Fix Stage2SdkDirectory 2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
a7fdc20f25 Convert redist.csproj outputdir to static property 
Also some cleanup to unnecessary stuff.
 2017-02-21 22:17:28 -08:00
Mike Lorbetske
36717ef3fc Fix lzma archive creation to include 1.0.x packages 2017-02-21 21:04:50 -08:00
Piotr Puszkiewicz
7a84c47d97 Update CLI branding 2017-02-21 16:40:12 -08:00
Mike Lorbetske
e145ca88e4 Placeholder for template update 2017-02-21 16:28:47 -08:00
Piotr Puszkiewicz
5ca773e67d Initial commit of 1.0.1 branch 2017-02-21 16:03:28 -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
b58a0210e2 Refactor properties from LzmaCompile.targets 2017-02-21 12:52:17 -08:00
Justin Goshi
f8148abec3 merge 2017-02-21 10:16:07 -08:00
Justin Goshi
27a11e4eca Merge branch 'master' into dev/jgoshi/morePropsRename 2017-02-21 10:00:30 -08:00
Livar Cunha
3ff78c64ff Fixing the build breaks by removing duplicate RemoteAssetsFromDepsJson and by fixing VersionSuffix in some needed test packages, because now they import dirs.props and dirs.props eventually brings in VersionSuffix. 2017-02-18 22:03:36 -08:00
Livar
aba1e18ff6 Merge branch 'rel/1.0.0' into tp-20170217 2017-02-17 21:34:26 -08:00
Piotr Puszkiewicz
0f919d7442 fix merge 2017-02-17 13:07:14 -08:00
Justin Goshi
4f209e61ea Refactor properties out of test.targets 2017-02-17 12:28:25 -08:00
Justin Goshi
30a43b3bda Merge 2017-02-17 09:53:00 -08:00
Livar
c779000010 Merge branch 'rel/1.0.0' into update_platform_abstractions 2017-02-17 09:02:54 -08:00
Satya Madala
44100209bc update TestPlatform version to 15.0.0-preview-20170217-05 2017-02-17 19:25:44 +05:30
Piotr Puszkiewicz
85b2a129db Merge branch 'rel/1.0.0' 
Conflicts:
	TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
	TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
	TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
	build.proj
	build/Compile.targets
	build/Microsoft.DotNet.Cli.Compile.targets
	build/Microsoft.DotNet.Cli.DependencyVersions.props
	build/Microsoft.DotNet.Cli.Monikers.props
	build/Microsoft.DotNet.Cli.Prepare.targets
	build/package/Microsoft.DotNet.Cli.Nupkg.targets
	build/package/Nupkg.targets
	build/test/TestPackageProjects.targets
	build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
	build_projects/dotnet-cli-build/GetCommitCount.cs
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
	src/dotnet-archive/dotnet-archive.csproj
	src/tool_msbuild/tool_msbuild.csproj
	src/tool_nuget/tool_nuget.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
	test/ArgumentsReflector/ArgumentsReflector.csproj
	test/EndToEnd/EndToEnd.csproj
	test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/crossgen.Tests/crossgen.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-build.Tests/dotnet-build.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj
	test/dotnet-pack.Tests/dotnet-pack.Tests.csproj
	test/dotnet-publish.Tests/dotnet-publish.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-run.Tests/dotnet-run.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj
	test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj
	test/dotnet-test.Tests/dotnet-test.Tests.csproj
	test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
	test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj
	tools/Archiver/Archiver.csproj
 2017-02-17 02:00:05 -08:00
Piotr Puszkiewicz
60b73e62a9 bump SDK to 20170217-2 2017-02-17 00:44:38 -08:00
Livar Cunha
1c409befbe Updating DependencyModel to 1.0.2 2017-02-17 00:29:17 -08:00
Justin Goshi
23a3879f46 Fix build break 2017-02-16 16:42:49 -08:00
Justin Goshi
5359ce47e9 Rename 2017-02-16 15:10:18 -08:00
Justin Goshi
e232e7d386 Revert the new file name 2017-02-16 15:09:42 -08:00
Justin Goshi
8acaadb625 Revert the rename 2017-02-16 15:09:08 -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
e7de32e988 Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 17:02:42 -08:00
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
Livar Cunha
72cd3d7c43 Pinning stage0 to latest and reverting build scripts to use stage0 for now. 2017-01-05 12:40:23 -08:00
Livar Cunha
3b69588db2 Picking up the latest SDK and adding back some named parameters to MigrateBuildOptionsRule for clarity. 
Updating the tool project to use BuiltProjectOutputGroupOutput instead of content because of SDK issue https://github.com/dotnet/sdk/issues/588
 2017-01-05 12:31:49 -08:00
Livar Cunha
3a4e23e373 Updating the SDK to an SDK that includes globing for source and resources implicitly. 2017-01-05 12:31:48 -08:00
Harsh Jain
f04930658d Merge branch 'rel/1.0.0' into clirunsettings 2017-01-06 01:15:49 +05:30
Eric Erhardt
a80e8fa636 Update Microsoft.NETCore.App to 1.0.3. 2017-01-05 08:57:53 -06:00
Harsh Jain
71027cda33 Merge branch 'rel/1.0.0' into clirunsettings 2017-01-05 00:53:41 +05:30
Livar Cunha
46e06962ba Updating the SDK version in the CLI. 2017-01-03 12:45:01 -08:00
Harsh Jain
8d86e14d44 Added support for passing runsettings options through command line after -- 2016-12-30 11:27:37 +05:30
Justin Goshi
38bcc787fa Skip uploading archive if it already exists (#5170) 
* Skip uploading archive if it already exists

* Adding a comment explaining the change
 2016-12-28 13:05:24 -10:00
Satya Madala
05df71825d Testplatform release 15.0.0-preview-20161227-02 (#5055) 
* Update testplatform packages version

* Refer TestPlatform version from DependencyVersions.props

* Updating the packages with respect to Testplatform release 15.0.0-preview-20161227-02

* Add dit.props to test assets projects
 2016-12-28 10:17:33 -08:00
Justin Goshi
af31b4fac4 Archive upload path needs to be changed (#5159) 2016-12-27 13:25:51 -10:00
Justin Goshi
b72d625168 Include ASP packages in offline cache (#5124) 
* Archive asp.net package references

* Archive asp.net package references

* Change the hash input so it's the same on all platforms

* Address PR comments
 2016-12-27 11:28:24 -10:00
Zlatko Knezevic
116ed9bca6 Introducing solution file for test projects 
This commit introduces a solution file for test projects and modifies
the needed build targets to restore the test solution instead of each
test project separately.

It also introduces a new template called "sln" to dotnet new that drops
a template solution file for users to consume.

Fixes #5099
 2016-12-22 09:47:19 -08:00
Livar Cunha
dedc782e1a Bumping the version of the SDK that ships in the CLI. 2016-12-21 13:08:31 -08:00
Livar Cunha
3b081316ad Updating the SDK version in the BundleSdks.props and adding dirs.props back to all csprojs but the TestAssets ones. 2016-12-20 16:38:04 -08:00
Livar Cunha
fadacc0aac Updating the projects files in the repo to use the SDK attribute. 2016-12-20 15:52:50 -08:00
Piotr Puszkiewicz
2fbafe6f3f Remove StreamForwarder from CLI tests (#4936) 
* WiP

* Replace StreamForwarder with OutputDataReceived

* Add build logging around test execution

* add newlines

* Add handling for the null terminator while maintaining empty lines

* Extra Diag

* Verbose logging for VS Test Console

* Fix asset file locking tests

* Add testcommand timeout + improve dotnet-new tests

* WiP

* Welcome, JoSequ!

* Fix failing tests

* Clean out diagnostics writelines

* self-PR1
 2016-12-13 14:15:35 -08:00
Livar
1fd99f1588 Merge rel/1.0.0-preview4 back into rel/1.0.0 (#4974) 
* Updating the preview4 channel to rel-1.0.0-preview4

* Add more xlf files for new strings

* bundle fsharp sdk, only Sdk directory is required

* align f# console proj

* align f# lib template

* align f# mstest template

* align f# xunit template

* align f# web template

* fix mstest package version, aligned to c#

* remove unused directories from bundled sdks

* Adding a SdkNugetVersion property when invoking dotnet pack on test packages so that test packages can reference exact packages. We need that because of https://github.com/NuGet/Home/issues/4063. Without it, pack creates the nuspec with a version like 1.0.0-version-, instead of 1.0.0-version-<version_used_in_build>, which leads to problems when restoring the tool. Like, it ends up restoring to the closest version of the package (oldest), instead of the latest.

* Update web template for Web SDK 154 (#4948)

* Update WebSDK version

* Update web template to get rid of globs

https://github.com/aspnet/Templates/pull/735

* MSBuild to 15.1.458 (#4950)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet (#4963)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet and adding a E2E test to cover it.

* Do not migrate compile and EmbeddedResources for web application, because those are included in the Web Sdk already.

* Addressing code review comments
 2016-12-09 00:30:02 -08:00
Livar
86272a8812 Merge pull request #4928 from piotrpMSFT/piotrpMSFT/issues/3527/disableVsoTests 
Allow CLI CI servers to opt out of test
 2016-12-05 15:47:47 -08:00
Livar Cunha
de9ae38375 Updating the branding of rel/1.0.0 to preview5. 2016-12-05 14:47:16 -08:00
Piotr Puszkiewicz
e9b8507183 Allow CLI CI servers to opt out of test 2016-12-05 13:36:35 -08:00
Piotr Puszkiewicz
d5f7af1604 Update WebSDK version 2016-12-05 00:54:30 -08:00
Piotr Puszkiewicz
d6cab4af58 use Sdks attribute in dotnet new templates (#4916) 
* Move dotnet-new templates to Sdk attribute

* Update to MSBuild 15.1.0-preview-000454-01

To pick up a fix for Microsoft/msbuild#1431.

* Fix template newlines

* Fix casing on Microsoft.Net.Sdk

* Move migration test csproj's to Sdk attribute

* Disable parallel sdk restore

Each SDK restore operation will try to manipulate the same assets.json file since the dependency name&version are injected into a common csproj file. This can cause runtime failures when two NuGets try to restore the project at once.

* Make casing of SDK 'NET' and not 'Net'

* Remove redundatn imports

* Fix test string

* Additional race

* Replacing the SDK with the Web.Sdk when it is a Web project.

* Fixing the test by writting the csproj before running the migration rule.
 2016-12-04 22:31:58 -08:00
Mike Lorbetske
382c3438f9 Add missing SDKs (#4912) 
* Add missing SDKs

NuGet.BuildTasks.Pack 4.0.0-rc2
Microsoft.NET.Sdk.Publish (parameterized version)
Microsoft.NET.Sdk.Web.ProjectSystem (parameterized version)

* Fix version number for Microsoft.NET.Sdk
 2016-12-04 12:15:07 -08:00
Piotr Puszkiewicz
d2d0353e60 Include Microsoft.Net.Sdk in CLI layout (#4895) 
* WiP

* Update test

* Working version of Net SDK

* Latest SDK doesn't work as packageref

* DCR + PR

* Harden CLI tests against #4884
 2016-12-03 14:19:54 -08:00
Piotr Puszkiewicz
da82bdb05d Centralize Microsoft.Net.SDK Version (#4890) 
* Centralize Microsoft.Net.Sdk package version

Note: Templates were omitted as their version needs to be static.

* Unifying additional missmatched versions

* prefercliruntime

whitespace threw off ReplaceAll

* Additional missed globs

* Revert SDK version for performance tests

* PR Feedback

* Roll back VSTestXunitDesktopAndNetCore.csproj SDK version
 2016-12-02 09:34:03 -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
Krzysztof Wicher
33529b567e fix build by not running tests on a test helper library 2016-11-30 15:14:57 -08:00
Livar
325b849858 Merge pull request #4814 from livarcocc/invoke_tool_cli_fx 
Making Project Tools use the CLI shared runtime
 2016-11-25 16:12:38 -08:00
Faizan2304
eb8e0cfa40 Bug fixes (#4810) 
* Bug fixes

* Nitpick

* -Fixed failed tests
-Added test to cover trx logger scenario.

* Fix for issue https://github.com/Microsoft/vstest/issues/241

* Fix for failed test. We have taken fix where dotnet test will return nonzero if test fails. In multi TFM scenario if test fails it termates the whole process as dotnet test is returning 1. As a fix of this we should continue if some test fails for next TFM

* Bump Microsoft.Testplatform.CLI and Microsoft.NET.Test.Sdk version
 2016-11-24 00:48:54 -08:00
Piotr Puszkiewicz
3a3ab7e0b0 MSBuildSDKsPath (#4824) 
* Tests in place

* Implementation
 2016-11-23 23:54:44 -08:00
Livar Cunha
dc87680337 Making Project Tools use the CLI shared runtime if they have the prefercliruntime in the root of their package. This allows for project tools to not have to change when a new runtime comes up as long as they are compatible with the runtime that the CLI is using. 2016-11-23 09:25:47 -08:00
Justin Goshi
be61afcfa5 Remove unused project.json and .xproj files (#4735) 
* Remove unused project.json and .xproj files

* Update the test msi script
 2016-11-15 16:12:19 -10:00
Justin Goshi
51562109ea Migrate test packages (#4720) 
* Migrate TestPackages

* Add check for desktop available

* Revert previous change

* WIP try something for non-Windows

* Another attempt to pack properly on non-windows

* Another attempt to fix pack errors

* Remove spaces

* Another attempt to make pack work cross-platform
 2016-11-15 12:12:28 -10:00
Krzysztof Wicher
9212605e89 binding redirects tests: Simplify and get ready for enabling (#4692) 
* binding redirects tests: Simplify and get ready for enabling

* fix targets broken during cleanup

* fix non-windows build

* apply pr feedback: remove some not needed code

* remigrate BindingRedirects samples, add x64 to bind redir proj
 2016-11-14 14:26:03 -08:00
Justin Goshi
6d57ca7e14 Migrating all test projects (#4668) 
* WIP migrate tests

* WIP fixing more tests

* WIP fix test build break

* Test results files are now trx

* Get CI to pass until we get an xunit xml logger

* Added DotNetTestPJ since that was needed for one test

* Fix build break

* Forgot to add DotNetTestPJ as a build task

* Need to restore project.json for the project used in ubuntu test

* Restore PJ for ubuntu test

* Switch the Ubuntu test to csproj based
 2016-11-11 21:46:29 -10:00
Livar
25ee09a29b I had a wrong condition before, where I forgot to reference a variable. Fixing that here. (#4665) 2016-11-09 16:44:35 -08:00
Livar
5f3885cff4 Merge pull request #4656 from livarcocc/improve_lzma_build 
Changing the lzma generation
 2016-11-09 11:38:59 -08:00
Livar Cunha
087852b1b8 Changing the lzma generation to first trying to download it from blob. If that fails, generate it. And if we generate it and we are uploading things to azure, upload it as well. 2016-11-08 15:14:47 -08:00
Livar Cunha
c7841909fd Updating the CLI versino to preview4. 2016-11-07 10:39:59 -08:00
Piotr Puszkiewicz
51cb0ab4d5 Remove deprecated nupkgs, pack in-place to enable signing (#4615) 
* Remove deprecated nupkgs, pack in-place

* Add back target specifiers.

* fix suffix
 2016-11-03 22:11:58 -07:00
Livar Cunha
a03eac7e1b Switching the archiver to be a portable app to get around runtime specific issues with having two stage0. 2016-11-03 16:28:21 -07:00
Piotr Puszkiewicz
fd9cb55f1a Add msbuild-based stage0 where possible (#4597) 
* Add msbuild-based stage0 where possible

* Fix bash initialization script

* Windows Fixes

* Fix dotnet deb tool
 2016-11-02 23:01:57 -07:00
Faizan Ahmad
4af8d52a23 Updated the version of microsoft.testplatform.cli package 2016-11-02 18:11:36 +05:30
Faizan Ahmad
0995daf83e 1) Added test to cover xunit scenario 
2) Added log in multi tfm test to root cause the issue where it is failing for net46
 2016-11-02 01:45:44 +05:30
Faizan Ahmad
5c5ce3d336 Enable test verb tests 2016-11-01 22:01:30 +05:30
Faizan Ahmad
be9fd8388b Hack for bug https://github.com/dotnet/sdk/issues/115 for Microsoft.TestPlatform.CLI 2016-11-01 20:10:34 +05:30
Jeff Kluge
595a768e30 Custom logger for MSBuild to receive telemetry events (#4551) 
* Upgrade MSBuild references to 15.1.0-preview-000370-00

* Custom logger for MSBuild to receive telemetry events

Had to make the telemetry session ID a static variable so that the forwarding app could use it.

I've tested this all manually and will be writing tests after everyone signs off on the implementation here.
 2016-10-31 16:16:39 -07:00
Justin Goshi
a4776a2b2c Migrate src and tools to csproj (#4538) 
Thanks for getting this in!
 2016-10-29 01:04:20 -07:00
Faizan Ahmad
63a14fd3ab Merge from rel/1.0.0 2016-10-28 17:56:24 +05:30
Piotr Puszkiewicz
6fcbefa4f7 [WIP] Removes *3 verbs, making msbuild the driver (#4456) 
Removes *3 verbs, making msbuild the driver
 2016-10-27 18:46:43 -07:00
Faizan Ahmad
679ea57acf Merge branch 'rel/1.0.0' into test3formultipletfm 2016-10-26 21:46:55 +05:30
Faizan Ahmad
33caa408a1 1) Added support to run test from test3 verb for the project targeting multiple TFM 
2) Added test to address above change
3) Crossgen were creating problem for full CLR built assemblies. Removed All those assembly from Crossgen list.
4) Removed the line of code which were deleting Extensions folder under sdk folder as this folder contain trx logger dlls
 2016-10-25 20:10:18 +05:30
Livar Cunha
de46aae96c Updating the branding in the installers to preview3. 2016-10-24 13:40:06 -07:00
Livar
6f62a8155c Merge pull request #4395 from livarcocc/projectdependenciescommandresolver 
Making Projectdependenciescommandresolver work with MSBuild
 2016-10-17 10:45:47 -07:00
Piotr Puszkiewicz
ad19f5ecb7 Prevent paths with escapable characters like @ (#4418) 
Thanks for the investigation, @cdmihai
 2016-10-14 16:42:33 -07:00
Livar Cunha
d8a10024e5 Addressing code review comments by removing unnecessary test artifacts. 2016-10-14 12:56:18 -07:00
Livar Cunha
318c9f3e44 Making ProjectDependenciesCommandResolver handle msbuild projects as well by using the ProjectFactory and IProject. 
Moving the CommandResolution classes that depend on msbuild back into Cli.Utils.

Updating the src projects to a netstandard compatible with Cli.Utils moving to netstandard1.5
 2016-10-14 12:56:18 -07:00
Piotr Puszkiewicz
02a19aff56 dotnet-new csproj templates (#4382) 
Make csproj templates first-class in dotnet-new.
 2016-10-14 00:06:35 -07:00
Nate Amundson
3ae14ab618 Upload checksums for installation artifacts (#4191) 
The checksums are SHA-512 hashes, which users can use to verify file
integrity and authenticity.
 2016-10-12 14:25:06 -05:00
Eric Erhardt
b5329995d8 Merge branch 'rel' 2016-10-11 17:01:33 -05:00
Eric Erhardt
38753d42b0 Fix the tests for targeting netstandard1.3. 2016-10-11 16:01:03 -05:00
Piotr Puszkiewicz
b9abb2460e Merge pull request #4359 from dotnet/piotrpMSFT/fixMsiSigning 
Prevent rebuild of CLI SDK installer after signing
 2016-10-10 14:48:12 -07:00
Eric Erhardt
93166dd77c Merge pull request #4361 from eerhardt/RemoveFsc 
Remove dotnet-compile-fsc.
 2016-10-10 14:17:29 -05:00
Eric Erhardt
6cf0327875 Remove dotnet-compile-fsc. 
It's new home is https://github.com/dotnet/netcorecli-fsc/
 2016-10-10 11:23:46 -05:00
Piotr Puszkiewicz
bf7c9d3d0c PR Feedback 2016-10-10 08:52:57 -07:00