Commit graph

3547 commits

Author SHA1 Message Date
Eric Erhardt
0e4044b8bd Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160831-1 2016-09-01 11:08:34 -05:00
Livar
c0c07ed959 Merge pull request #4127 from livarcocc/merge_feature_msbuild_into_rel100
Merge feature msbuild into rel100
2016-08-31 13:48:42 -07:00
Livar Cunha
4220447322 Temporarily hard coding stage0 to come from feature msbuild. This will make a stage0 available that has a dotnet build3 command. Will revert this once we have a rel1.0.0 available with this verb. 2016-08-31 12:46:24 -07:00
Livar Cunha
0c60dc7c2e Fixing the version back to preview3 and the channel to rel-1.0.0 2016-08-30 21:32:45 -07:00
Livar Cunha
e94a53326d Merged branch feature/msbuild into merge_feature_msbuild_into_rel100 2016-08-30 15:38:15 -07:00
Livar
9cb6e99656 Merge pull request #4116 from dotnet/piotrpMSFT/branchmerge
Merge rel/1.0.0 into feature/msbuild
2016-08-30 15:26:18 -07:00
PiotrP
e23ffbe13e Adjust ToolPath 2016-08-30 14:18:13 -07:00
PiotrP
a6ee3df5b2 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-30 14:10:47 -07:00
Piotr Puszkiewicz
74a9a533bd Merge pull request #4121 from dotnet/piotrpMSFT/revmsbuild
Update msbuild version to latest
2016-08-30 14:03:18 -07:00
Bryan Thornbury
dc59da7ce3 Merge pull request #4074 from brthor/brthor/migrate-reviewable
ProjectJson to  CSProj Migration
2016-08-30 13:36:07 -07:00
Bryan Thornbury
b0554d3ff3 PR Feedback 2016-08-30 12:00:56 -07:00
Bryan Thornbury
903764aa7d Fix msbuildexe config 2016-08-30 12:00:11 -07:00
Bryan Thornbury
28e2aa493d ProjectJsonMigration Tests 2016-08-30 12:00:11 -07:00
Bryan Thornbury
47cf8fbda6 Additional TestAssets 2016-08-30 12:00:11 -07:00
Bryan Thornbury
b900f0b327 Solution and project cleanup 2016-08-30 12:00:08 -07:00
Bryan Thornbury
d8556d1ed7 Include context fixes to include the default files even when buildoptions is empty, so we have less custom logic in the migration library 2016-08-30 11:56:56 -07:00
Bryan Thornbury
611e4ccfde dotnet-migrate built in command for cli 2016-08-30 11:56:53 -07:00
Bryan Thornbury
46818ff3fa Microsoft.DotNet.ProjectJsonMigration core library 2016-08-30 11:56:03 -07:00
Piotr Puszkiewicz
22db479ee2 Move DEB.proj in-process 2016-08-30 11:45:58 -07:00
PiotrP
c74370b636 Update MSBuild version 2016-08-30 11:18:40 -07:00
PiotrP
ec23abadec Update MSBuild version 2016-08-30 10:31:04 -07:00
PiotrP
3cdd15a145 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-30 10:30:45 -07:00
Livar
be8428cb6c Merge pull request #4102 from livarcocc/test_without_pj
Adding the capability to run tests against a published dll
2016-08-29 21:58:13 -07:00
PiotrP
afcc679646 Try da hak 2016-08-29 14:35:55 -07:00
Piotr Puszkiewicz
eff2beeb7d Clean up dead code 2016-08-29 10:27:53 -07:00
Livar Cunha
7d60d66a86 Addressing more code review comments. 2016-08-29 09:46:12 -07:00
Piotr Puszkiewicz
7993b438a0 Reset ToolsVersion to 14 2016-08-27 21:46:18 -07:00
Piotr Puszkiewicz
c8139a9790 Bump ToolsVersion to 15 2016-08-27 18:31:26 -07:00
Piotr Puszkiewicz
3a2632f6d5 Refactor DEB.proj 2016-08-27 18:07:49 -07:00
Piotr Puszkiewicz
8eecff0112 Address build issues 2016-08-27 15:57:14 -07:00
Piotr Puszkiewicz
ab1797cb29 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-26 22:39:40 -07:00
Piotr Puszkiewicz
1ce482a8d1 Merge remote-tracking branch 'refs/remotes/origin/rel/1.0.0'
Conflicts:
	scripts/obtain/dotnet-install.ps1
	src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template
2016-08-26 22:39:14 -07:00
PiotrP
ae4a690724 Fix tests
Missing namespace
Re-enable dotnet-nuget unit tests
2016-08-26 18:14:04 -07:00
PiotrP
336ecc0e89 Merge Nuget changes
Fix pack
Move dotnet-nuget to NuGetForwardingApp [tests will need to be fixed]
2016-08-26 17:23:33 -07:00
PiotrP
ed66c70106 wIp 2016-08-26 15:46:08 -07:00
Livar
2b70193448 Merge pull request #4093 from simondel/CSharp_xunittest-dependencies
Update xunit dependencies for CSharp_xunittest template
2016-08-26 13:28:12 -07:00
Livar Cunha
9f2a0169fc Addressing code review comments. 2016-08-26 11:23:47 -07:00
Michael Simons
6f974e2fed Merge pull request #4104 from MichaelSimons/InstallCleanup
Modified logic dotnet-install.ps1 to provide better diagnostics upon failure
2016-08-26 13:22:25 -05:00
Livar Cunha
b09a6c6350 Adding dotnet-test-console to the list of generated nupkgs and fixing some namespace for the new command resolvers. 2016-08-25 23:14:25 -07:00
Livar Cunha
e8f2dabcdb Fixing broken tests after my changes to the CommandResolvers. 2016-08-25 22:53:04 -07:00
Livar Cunha
55c00a7e45 Adding a resolution chain to the command resolution chain that works based on a directory, more specifically, the publish directory. 2016-08-25 16:01:32 -07:00
PiotrP
c5b4e48410 Initial removal of DebPackageCreator.cs 2016-08-25 13:19:22 -07:00
Michael Simons (VISUAL STUDIO)
7914b63474 Modified logic that downloads content to provide better diagnostic information upon failure. 2016-08-25 11:47:45 -05:00
Simon de Lang
8f92f0d74b Update xunit dependencies for CSharp_xunittest template 2016-08-25 15:02:52 +02:00
Eric Erhardt
1fb4703095 Merge pull request #4071 from voltagex/voltagex/camelcase-xproj-file
Rename Microsoft.Dotnet.Compiler.Common.xproj to match casing in .sln
2016-08-24 22:48:40 -05:00
Livar Cunha
7e556e37d2 Adding a separate runner for project.json and for assembly. 2016-08-24 15:24:30 -07:00
Eric Erhardt
23da701cee Merge pull request #4083 from nguerrera/msbuild-update
Update to new msbuild
2016-08-24 13:57:07 -05:00
Nick Guerrera
2accc15543 Add missing msbuild dependency
This is a workaround until the msbuild .nupkg manifests
the dependency correctly
2016-08-24 10:29:53 -07:00
Nick Guerrera
c702957730 Update to new msbuild 2016-08-24 10:10:20 -07:00
Piotr Puszkiewicz
56d2153c08 WiP 2016-08-23 16:09:12 -07:00