Commit graph

149 commits

Author SHA1 Message Date
Piotr Puszkiewicz
ab1797cb29 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-26 22:39:40 -07:00
Nick Guerrera
c702957730 Update to new msbuild 2016-08-24 10:10:20 -07:00
Piotr Puszkiewicz
578adf072c Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'
Conflicts:
	src/dotnet/Program.cs
2016-08-18 18:08:45 -07:00
Joel Verhagen
aacc30d5d8 Add "path" property the .deps.json file for libraries
Update DependencyModel and PlatformAbstractions packages to 1.0.1-beta-000917
Update dotnet-test-xunit to 1.0.0-rc2-330423-54
2016-08-18 15:57:03 -07:00
Piotr Puszkiewicz
2db1997bc0 Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'
Conflicts:
	Microsoft.DotNet.Cli.sln
	build_projects/dotnet-cli-build/DebTargets.cs
	build_projects/dotnet-cli-build/TestTargets.cs
	scripts/package/package-debian.sh
	src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs
	src/dotnet/commands/dotnet-new/Program.cs
	src/dotnet/commands/dotnet-pack/PackageGenerator.cs
	test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs
2016-08-16 18:30:52 -07:00
Justin Emgarten
51ea2e6014 Adding Restore3 command for msbuild restore support. 2016-08-12 00:05:21 -07:00
Eric Erhardt
f48effff61 Add System.Resources.Writer to src\dotnet\project.json 2016-08-10 20:08:54 -05:00
Eric Erhardt
736652fe71 Remove the SDK artifacts from the CLI.
These are now contained in github.com/dotnet/sdk.
2016-08-10 20:08:17 -05:00
Livar Cunha
dc7f1fdf84 Updating the xunit version to one that does not depend on internalabstractions. 2016-08-10 13:40:13 -07:00
Piotr Puszkiewicz
3a55a4182f src/redist/project.json 2016-08-09 13:22:22 -07:00
Eric Erhardt
2bea6bac83 Move 14.1 to 15.0 now that MSBuild is version 15.0. 2016-08-09 10:28:50 -05:00
Piotr Puszkiewicz
79648f9ccb Update stage0 msbuild 2016-08-07 01:51:47 -07:00
jplebre
b889e97a88 fixed trailing commas 2016-08-03 22:06:17 +01:00
jplebre
069a351971 adding nunit test to the list of commands 2016-08-03 22:06:17 +01:00
Eric Erhardt
b3e69b139e Update NuGet to 3.5.0-rc1-1697 2016-08-01 13:58:04 -05:00
Eric Erhardt
2ac8ca0e07 Update Microsoft.NuGet.Build.Tasks to 1.0.0-alpha-000002, which has the casing fix for Microsoft.Net.Compilers.netcore dependency. 2016-07-26 20:53:19 -05:00
Eric Erhardt
369a6894dd Fix the casing of Microsoft.Net.Compilers.netcore since the latest NuGet cares about this now. 2016-07-26 20:53:18 -05:00
Eric Erhardt
6eabeb9be0 Generate runtimeconfig.json and runtimeconfig.dev.json from MSBuild
Moves generating the runtimeconfig files to a separate MSBuild target which is only dependent on project.lock.json.

Also, moving up our NuGet dependency to 3.5.0-rc1-1653, since that brings in the LockFile.PackageFolders property, which is needed for runtimeconfig.dev.json.
2016-07-26 20:53:17 -05:00
Bryan Thornbury
5d96412b14 change feature-msbuild branch versions 2016-07-25 14:05:41 -07:00
Eric Erhardt
9751b3203c Remove the Sdk nuget package. 2016-07-21 12:18:00 -05:00
Eric Erhardt
b068687413 Implement 'run3' command which will execute the MSBuild project.
Also create a 'dotnet new -t msbuild' template.
2016-07-21 11:57:20 -05:00
Eric Erhardt
bccff16c18 Round 2: rename the SDK NuGet package and add ImportBeforeAfter files to load them. 2016-07-21 11:57:19 -05:00
Eric Erhardt
d2db776d87 Merge rel/1.0.0 into feature/msbuild. 2016-07-18 14:44:06 -05:00
Eric Erhardt
703da0da3e Microsoft.NuGet.ImportBefore and ImportAfter
Add Microsoft.NuGet.ImportBefore and ImportAfter files so .nuget.props and .nuget.targets files get picked up invoking 'dotnet build3'.

I also fixed some .xproj and .sln file issues to get our code to work in VS.
2016-07-12 18:44:16 -05:00
cartermp
51e7ab465b Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
This updates the F# templates for dotnet-new to be compatible with Preview 2.
2016-07-05 21:38:12 -07:00
Bryan Thornbury
400e1db3b9 dotnet-build3 Adding msbuild execution command to cli 2016-06-23 13:57:33 -07:00
Bryan Thornbury
d717b84ec8 merge rel/1.0.0-preview2 into rel/1.0.0 2016-06-15 10:20:50 -07:00
jacalvar
635c3331df Update to Json.NET 9.0.1 2016-06-14 03:21:56 -05:00
Eric Erhardt
a4cef6d367 Updating NuGet to beta2-1484 2016-06-14 03:19:04 -05:00
Eric Erhardt
f25f047376 Updating CoreFX, CoreCLR, Roslyn, CoreSetup to stable versions. 2016-06-14 03:14:53 -05:00
Livar
9f2bb66198 Merge pull request #3485 from livarcocc/offline
Offline feature work
2016-06-12 00:58:26 -07:00
Eric Erhardt
c1c7ca06c2 Update NuGet to 3.5.0-beta2-1480 2016-06-11 12:23:24 -05:00
eerhardt
2aa3dd0843 Updating CoreFx, CoreClr, Roslyn, CoreSetup to rc3-24210-10, rc3-24210-10, beta1-20160610-04, rc3-3004459-00 respectively 2016-06-11 04:29:58 +00:00
Bryan Thornbury
f27330a09b Revert "move all version suffixes to preview3 and rc4"
This reverts commit 35432bcb4a32ddd6b672f86b206e2b1933eff035.
2016-06-10 16:54:19 -07:00
Bryan Thornbury
32962a14e2 move all version suffixes to preview3 and rc4 2016-06-10 16:53:57 -07:00
Livar Cunha
84f63029fe Almost all of the code to prime the NuGet cache from the archive.
- Created a Configurer class that is responsible for deciding when to run the dotnet first time use
experience and invoke the NuGetCachePrimer.
- Added the NuGetCachePrimer which extract the archive and primes the cache.
-- This is just missing creating the sentinel once restore succeeds.
- Added a shell for the NugetPackagesArchiver, which will be responsible for expanding the archive (likely
replaced in the future by an abstraction from Eric's code or its implementation will simply call Eric's code).
- Added a TemporaryFolder abstration to Internal Abstractions that handles deleting the temporary folder once
we are done with it.
2016-06-10 16:53:55 -07:00
eerhardt
7b51f28c7f Updating CoreFx, CoreClr, CoreSetup to rc3-24210-06, rc3-24210-01, rc3-3004449-00 respectively 2016-06-10 15:05:30 +00:00
Eric Erhardt
ef4a8e85ef Updating CoreSetup to rc3-004443-00. 2016-06-10 01:09:46 -05:00
eerhardt
cd9bcd40b3 Updating CoreFx, CoreClr, CoreSetup to rc3-24209-08, rc3-24208-04, rc3-3004442-00 respectively 2016-06-09 21:14:15 -05:00
Lee Coward
cbf5f1ef65 Merge pull request #3458 from blackdwarf/prev2templates
Add new templates for C# to dotnet new
2016-06-09 10:17:26 -07:00
Zlatko Knezevic
c066ef1540 Add C# Lib and xunittest templates
Adding the C# lib and xunittest templates to `dotnet new`. These need
to be invoked with the `dotnet new -t lib` and `dotnet new -t
xunittest` keywords respectively.
2016-06-09 08:06:03 -07:00
Zhi Li
9a9864bf68 Update NuGet Version to 3.5.0-beta2-1451 2016-06-09 07:52:00 -05:00
Eric Erhardt
f43aad780c Updating CoreFx, CoreClr, Roslyn, CoreSetup, DiaSymReader to rc3-24208-04, rc3-24208-04, beta1-20160608-03, rc3-004425, rc2-60608-04 respectively 2016-06-08 22:56:25 -05:00
Ajay Bhargav Baaskaran
4a88cff185 [Fixes #3255] Added a web template to dotnet new 2016-06-08 11:31:08 -07:00
Eric Erhardt
d2f1fa0300 Updating CoreFx, CoreClr, CoreSetup to rc3-24207-03, rc3-24207-03, rc3-004415 respectively. 2016-06-07 18:24:30 -05:00
Jonathan Miller
cdf4407419 Bumping JSON.NET to 9.0.1 2016-06-07 15:04:17 -07:00
Eric Erhardt
2e7c467aad Merge pull request #3407 from dotnet/dev-ragrawal-updatenuget
update nuget to 3.5.0-beta2-1392
2016-06-07 15:50:13 -05:00
Eric Erhardt
334b079995 Updating CoreSetup, Roslyn, DiaSymReader to rc3-004408, beta1-20160606-02, 1.0.8-rc2-60606-01 respectively. 2016-06-06 18:56:24 -05:00
Rohit Agrawal
5378f5a697 update nuget to 3.5.0-beta2-1392 2016-06-06 14:14:20 -07:00
Eric Erhardt
42938f180f Updating CoreSetup to rc3-004406 2016-06-06 11:15:07 -05:00