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
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