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

1667 commits

Author SHA1 Message Date
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
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
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
Livar Cunha
9f2a0169fc Addressing code review comments. 2016-08-26 11:23:47 -07: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
Simon de Lang
8f92f0d74b Update xunit dependencies for CSharp_xunittest template 2016-08-25 15:02:52 +02:00
Livar Cunha
7e556e37d2 Adding a separate runner for project.json and for assembly. 2016-08-24 15:24:30 -07: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
Eric Erhardt
a543050c62 Update the Sdk version to the latest build. 2016-08-23 13:44:07 -05:00
Livar Cunha
dddfb6bb45 Adding new unit tests to cover TestRunner in DotnetTestParams. 2016-08-23 11:26:37 -07:00
Livar Cunha
0667e84069 Added an ITestRunnerResolverFactory that decides on which resolver to use based on the set of parameters received. 2016-08-22 21:29:14 -07:00
Livar Cunha
8e432e567a Adding TestRunner resolvers that will be able to find a test runner based on different criteria. 
Moving dotnet test command to its own library that can be shared between dotnet test and the test target in the SDK folder.
 2016-08-22 15:45:13 -07:00
Adam Baxter
feb6a1484d Rename Microsoft.DotNet.Compiler.Common.xproj to match the casing in the .sln 
Allows nuget restore to run (but fail) on case sensitive filesystems/platforms
 2016-08-22 22:30:48 +10: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
Piotr Puszkiewicz
c5cc9feb6d Update xunit template 2016-08-18 17:10:20 -07:00
Piotr Puszkiewicz
e92c9603c8 Test reliability and format cleanups 2016-08-18 17:10:20 -07:00
Rohit Agrawal
e08da40a1f added pack3 command for dotnet (#4058) 2016-08-18 16:53:55 -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
Livar Cunha
86f8115ee7 Updating the System.Reflection.Metadata version and changing the order of platform assemblies passed to crossgen. 2016-08-17 16:42:19 -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
drewgil
11b666acee Add nuget command to dotnet cli 2016-08-16 09:27:55 -07:00
Justin Emgarten
51ea2e6014 Adding Restore3 command for msbuild restore support. 2016-08-12 00:05:21 -07:00
Eric Erhardt
6cf2167992 Update the CLI to use the new Core SDK nuget package. 
No need for build3 to set Platform properties and BaseNuGetRuntimeIdentifier.  The SDK handles that.

Also, no need to set "runtimes" any more in the default project.json.
 2016-08-11 12:05:28 -05:00
Eric Erhardt
f48effff61 Add System.Resources.Writer to src\dotnet\project.json 2016-08-10 20:08:54 -05:00
Eric Erhardt
94223a7009 Tell dotnet restore to install nuget.props and nuget.targets files using an environment variable, so the SDK .targets are installed into the user's project. 2016-08-10 20:08:17 -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
8bb7e01f0f Fixing a version conflict in Testing.Abstractions and bumping InternalsAbstractions version to 2.0.0, since I removed some public APIs from it. 2016-08-10 13:40:27 -07:00
Livar Cunha
dc7f1fdf84 Updating the xunit version to one that does not depend on internalabstractions. 2016-08-10 13:40:13 -07:00
Livar Cunha
b7b90175f4 Removing the public types from InternalAbstractions. 2016-08-10 13:39:49 -07:00
Livar Cunha
0a55a7cb99 Updating the msbuild changes to handle DependencyModel coming from core-setup instead of a project dependency. 2016-08-10 13:39:49 -07:00
Livar Cunha
e900e23544 Updating dependencies to use the new dependencymodel and platformabstractions. Also updated the xunit template to add internalabstractions. 
Conflicts:
	src/Microsoft.DotNet.Cli.Utils/project.json
	test/dotnet-build.Tests/BuildOutputTests.cs
 2016-08-10 13:39:49 -07:00
Livar Cunha
ee1474c161 Removing dependency model from CLI repo. 
Conflicts:
	Microsoft.DotNet.Cli.sln
	build_projects/dotnet-cli-build/PackageTargets.cs
	build_projects/dotnet-cli-build/TestPackageProjects.cs
	build_projects/dotnet-cli-build/TestTargets.cs
	src/Microsoft.Extensions.DependencyModel/CompilationLibrary.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContext.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContextLoader.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContextWriter.cs
	src/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs
	src/Microsoft.Extensions.DependencyModel/Resolution/PackageCacheCompilationAssemblyResolver.cs
	src/Microsoft.Extensions.DependencyModel/Resolution/ResolverUtils.cs
	src/Microsoft.Extensions.DependencyModel/project.json
	test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonWriterTests.cs
	test/Microsoft.Extensions.DependencyModel.Tests/FunctionalTests.cs
	test/Microsoft.Extensions.DependencyModel.Tests/PackageCacheResolverTest.cs
	test/Microsoft.Extensions.DependencyModel.Tests/PackageResolverTest.cs
 2016-08-10 13:39:49 -07:00
Piotr Puszkiewicz
b3f5174f00 PR Feedback 2016-08-09 14:49: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
Zlatko Knezevic
3abada74d4 Update HelpCommand.cs 
Changing the text from "Common Commands" to just "Commands" to indicate that these are in the box, so to speak.
 2016-08-07 07:31:28 -07:00
Piotr Puszkiewicz
79648f9ccb Update stage0 msbuild 2016-08-07 01:51:47 -07:00
Tomáš Matoušek
8f00e03c43 Merge pull request #3989 from tmat/AnyDebugType 
Pass debugType thru to the command line compiler
 2016-08-04 13:14:42 -07:00
Tomas Matousek
dfbea3df34 Pass debugType thru to the command line compiler 2016-08-03 18:08:14 -07:00
jplebre
408d083525 eeeek! (sorry, wrong dependency version edited) 2016-08-03 22:06:17 +01:00
jplebre
4508884c42 clean up and added nunit command to README 2016-08-03 22:06:17 +01:00
jplebre
09d37fe3ec removed the -* from version numbers in xunit and nunit templates 2016-08-03 22:06:17 +01:00
jplebre
82bf84f46b projec.json should be the same as nunit's template 2016-08-03 22:06:17 +01: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
Bryan Thornbury
308f49c32e Merge pull request #3983 from brthor/brthor/runtimeoptions 
Add support for user runtimeconfig
 2016-08-03 10:51:33 -07:00
Bryan Thornbury
931e8fdf96 Add support for user runtimeconfig 2016-08-02 16:18:19 -07:00
Livar
32d273580f Merge pull request #3981 from livarcocc/dependency_model_change_from_rel100 
Merge the JsonTextReader change from rel/1.0.0 to feature/msbuild
 2016-08-02 14:23:43 -07:00
Pavel Krymets
ee6063b12b Use JsonTextReader in DependencyContextJsonReader (#3972) 
Using low level JsonTextReader in DependencyContextJsonReader class for performance reasons
 2016-08-02 13:16:44 -07:00
Eric Erhardt
ddb6a877af Add netstandard1.3 TFM to DependencyModel so the MSBuild task can target netstandard1.3 and still use it to write the .deps.json file. 2016-08-02 14:53:19 -05:00
Pavel Krymets
b7075b857b Use JsonTextReader in DependencyContextJsonReader (#3972) 
Using low level JsonTextReader in DependencyContextJsonReader class for performance reasons
 2016-08-02 10:02:30 -07:00
Eric Erhardt
df3fea3736 Merge pull request #3962 from eerhardt/msbuild-GenerateDepsFile 
Implement GenerateDepsFile MSBuild Task
 2016-08-01 20:17:05 -05:00
Eric Erhardt
b5d312e7fa PR feedback. 2016-08-01 19:06:46 -05:00
Eric Erhardt
10cfa744e5 PR feedback. 
Implement VersionPrefix and VersionSuffix MSBuild properties.

Use FluentAssertions in the test.
 2016-08-01 15:02:22 -05:00
Eric Erhardt
b3e69b139e Update NuGet to 3.5.0-rc1-1697 2016-08-01 13:58:04 -05:00
Eric Erhardt
a4aa0a99cd Implement GenerateDepsFile MSBuild Task 2016-07-29 20:46:34 -05:00
Livar Cunha
b05b0e6dc5 After NuGet started lower casing the packages, we started hitting issues where we failed to locate dependencies under our list of libraries due to different casing in the libraries names. The fix here is to compare the library names ignoring casing. 2016-07-28 21:17:32 -07:00
Eric Erhardt
eca827e0d4 Merge pull request #3922 from blackdwarf/templatesfix 
Remove namespace and public from console app
 2016-07-27 07:53:23 -05:00
Eric Erhardt
104ca5219d Ensure additional probing paths don't have a trailing slash. 
Workaround for https://github.com/dotnet/core-setup/issues/228.
 2016-07-26 22:27:25 -05:00
Eric Erhardt
ba0f71f5a5 Use object serialization to write the runtime config files. 2016-07-26 21:56:47 -05:00
Eric Erhardt
efc0efe4f9 Workaround native deps resolver not lower casing the file paths into the NuGet cache. 
This is needed until https://github.com/dotnet/core-setup/pull/64 is merged.
 2016-07-26 21:00:14 -05:00
Eric Erhardt
a48def9ade Fix package code for new NuGet. 
The new NuGet uses tolower paths, and we need to react to it.

Port https://github.com/dotnet/cli/pull/2722
Port https://github.com/dotnet/cli/pull/3554
 2016-07-26 20:53:20 -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
Piotr Puszkiewicz
dd43ccb688 Piotrp msft/merge2msbuild (#3941) 
* Add Test for removing readonly flag when copying readonly library assets

* change namespace

* PR Feedback

* Fix newlines in the first run experience message

The newlines in the first run experience were missing which made the text
look a little squashed.

Fixes #3909

* Update README.md (#3904)

* Update README.md

* Responding to PR feedback

* Responding to PR feedback
 2016-07-26 19:22:12 -04:00
Bryan Thornbury
7c71af8db5 get Eric's change 2016-07-25 14:06:46 -07:00
Bryan Thornbury
5d96412b14 change feature-msbuild branch versions 2016-07-25 14:05:41 -07:00
Zlatko Knezevic
6766017ffb Responding to PR feedback 2016-07-22 12:11:01 -07:00
Zlatko Knezevic
252be27100 Remove namespace and public from console app 
Fixes #745, #3531
 2016-07-22 11:56:05 -07:00
Eric Erhardt
c317c92691 Correcting the casing of Microsoft.Common.targets directory 2016-07-22 07:04:24 -05:00
Eric Erhardt
3a446ec5d4 Fixing the Sdk.props to work correctly for Release config and xplat pdb creation. 2016-07-22 07:04:24 -05:00
Eric Erhardt
5296b28db7 Removing all PlatformTarget setting in the default Sdk.props file. 
This value is passed in by the CLI.
 2016-07-22 07:04:23 -05:00
Zlatko Knezevic
d14fda084b Fix newlines in the first run experience message 
The newlines in the first run experience were missing which made the text
look a little squashed.

Fixes #3909
 2016-07-21 23:00:26 -07:00
Eric Erhardt
69619c0716 PR feedback. 2016-07-21 18:17:20 -05:00
Eric Erhardt
f0afc7eb79 Minor cleanup. 2016-07-21 12:41:20 -05: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
30712966cc Prototype round #1 of .NET Core MSBuild .props and .targets. 2016-07-21 11:57:18 -05:00
Eric Erhardt
d2db776d87 Merge rel/1.0.0 into feature/msbuild. 2016-07-18 14:44:06 -05:00
Eric Erhardt
164244f4df Merge pull request #3760 from svick/broken-links 
Fixed docs links in READMEs
 2016-07-14 15:20:17 -05:00
Ajay Bhargav Baaskaran
01021a0a6d Addressed feedback 2016-07-13 15:52:23 -07:00
Ajay Bhargav Baaskaran
dbf7435c3c [Fixes #3502] Fix: publishOptions: [...] not respected 2016-07-13 15:09:22 -07:00
Ajay Bhargav Baaskaran
c748c81a4a [Fixes #3856] Allow mapping of the same file to multiple target paths 2016-07-13 14:56:22 -07: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
e1be430f59 Add missing comma to F# lib project.json 2016-07-12 15:33:18 -07:00
Eric Erhardt
fc73287c53 Merge pull request #3789 from cartermp/fs-update 
Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
 2016-07-12 13:45:43 -05:00
Piotr Puszkiewicz
08e9bc903e CLI Testing via msbuild (#3779) 
* Rebase

* Remove Multi-Project Validator

* Remove projectmodelserver tests

* Enable test package creation

* Incremental test restore

* WiP

* Enable Test Asset Project restore

* Build Test Assets & Restore Test Projects

* Build Test projects

* Enable Test Execution

also moves Test Targets to a well-known CLI Version [Stage 2]

* Pass throuh existing telemetry profile

* 2-space tabs

* Revert TestTargets.cs

* WiP PR feedback

* Refactoring

* Fix naming of RestoreTestAssetPackages

* DotNetTest task

* Fix merge issue

* ExecuteWithCapturedOutput

MSBuild considers StdErr output to be failures. This causes output of any test command which is expected to produce an error to be swallowed in the test.

* Workaround for always-on tracing functionality in dotnet-test

* Fix Path Separator Windows/Unix

* Seperate package build from pack

* Windows Pathing issues

* PR Feedback

* Workaround for msbuild #773

https://github.com/Microsoft/msbuild/issues/773
 2016-07-11 12:46:27 -07:00
Livar
ec7fc0fc2d Merge pull request #3822 from csMACnz/patch-1 
Fix typo in `Avaiable` for `dotnet new --type` error output
 2016-07-11 10:13:52 -07:00
Eric Erhardt
fa59167974 Merge pull request #3794 from freefair/rel/1.0.0 
Fixed bug in build process with ReadOnly file flag
 2016-07-11 09:25:21 -05:00