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
Krzysztof Wicher
a6bc22e499
Remove TAM ( #5670 )
...
* remove reference to TestAssetsManager in dotnet-add-reference
* remove TestAssetsManager dependency from dotnet-build
* remove TAM ref from dotnet-list-reference
* remove TAM dependency from dotnet-msbuild
* remove TAM dependency from ProjectJsonMigration tests
* remove TAM dependency from dotnet.Tests
* remove TAM dependency from dotnet-new.Tests
* remove TAM from dotnet-pack.Tests
* remove TAM from dotnet-publish.Tests
* remove TAM from dotnet-restore.Tests
* remove TAM dependency from dotnet-remove-reference.Tests
* remove TAM dependency from dotnet-run.Tests
* remove TAM dependency from dotnet-test.Tests
* remove TAM dependency from Microsoft.DotNet.Cli.Utils.Tests
* remove TAM from TestBase
* remove TAM
* remove newly introduced dependency on TAM
2017-02-15 15:35:03 -08:00
Livar Cunha
8d38a2a67f
Making the tool name comparison with the package case insensitive, so that tools are not required to be declared with the exact casing as the packages that contain them.
2017-02-15 11:33:59 -08:00
Livar Cunha
9f2ca9989c
Introducing a in DependencyVersions to facilitate these updates in the future. Also aligns with master.
2017-02-10 23:05:16 -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
9f0bb778a1
Merge rel/1.0.0 into master.
2017-02-01 14:32:59 -06: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
cfb4cc3cb9
Update tests to netcoreapp1.1.
2017-01-26 14:48:39 -08:00
Eric Erhardt
d4153815d5
Update the CLI to netcoreapp2.0.
2017-01-26 07:28:59 -06:00
Krzysztof Wicher
5fea7c3ae6
Remove try catches choking all exceptions ( #5206 )
...
* remove some try catches choking all exceptions
* rename ExceptionExtension to ReportAsWarning, show full stack instead of just message
* dotnet-migrate try catch clean-up
* fix migration test failures
2017-01-12 15:42:36 -08:00
Eric Erhardt
5035320247
Add NuGet version to DependencyVersions.props.
2017-01-10 10:43:14 -06:00
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
Livar Cunha
b41eb43883
Updating our projects and test assets to work with the latest SDK.
2017-01-05 19:44:52 -08:00
Krzysztof Wicher
dfb0a28224
Merge pull request #5180 from krwq/5070b
...
Remove some cross project compile includes on cs files
2017-01-05 12:13:54 -08:00
Eric Erhardt
75786cd59a
Fixing It_adds_fx_version_as_a_param_when_the_tool_has_the_prefercliruntime_file test to expect 1.0.3.
2017-01-05 09:43:02 -06:00
Eric Erhardt
a80e8fa636
Update Microsoft.NETCore.App to 1.0.3.
2017-01-05 08:57:53 -06:00
Krzysztof Wicher
941575d188
Remove cross project compile include on DotnetFiles.cs
2016-12-29 14:34:24 -08:00
Krzysztof Wicher
e9dc08eafa
make localizablestrings internal again
2016-12-27 14:53:45 -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
Rohit Agrawal
4311926366
update nuget to 4.0.0-rc2 (dev build 2067) ( #4904 )
2016-12-02 19: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
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
Livar
9862fbb4d7
Checking that the lock file exists before trying to acquire the lock for it. ( #4797 )
...
* Checking that the lock file exists before trying to acquire a lock for it, which takes up to 30 seconds.
* Adding a test for failing when reading the lock file and it does not exists.
2016-11-23 22:59:54 -08:00
Livar Cunha
9e9d7f1d52
Turns out I had missed one code review comment. Fixing the string validation for one of the tests.
2016-11-23 12:56:37 -08:00
Livar Cunha
d5f7efbe86
Addressing code review comments.
2016-11-23 10:19:00 -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
Livar
da0e7b744b
Revert "update NuGet to 4.0.0-rc2 build ( #4802 )" ( #4818 )
...
This reverts commit 0bafbd061e
.
2016-11-23 09:01:32 -08:00
Rob Relyea
0bafbd061e
update NuGet to 4.0.0-rc2 build ( #4802 )
2016-11-22 00:51:12 -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
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
Rob Relyea
f961fef8e0
update NuGet in CLI to 4.0.0.2048 ( #4614 )
...
* update NuGet in CLI to 4.0.0.2047
* update NuGet in CLI to 4.0.0.2048
2016-11-03 22:11:44 -07:00
Livar Cunha
c7858afc48
Attempting to actually fix the build this time. We were not pointing to the right packages cache before.
2016-11-01 12:46:29 -07:00
Livar Cunha
9139c4006b
Fixing full framework tests
2016-11-01 00:31:21 -07:00
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
Livar Cunha
59ac685dcd
Updating the msbuild version to one with the preserve compilation context fix.
2016-10-28 18:19:41 -07:00
Justin Emgarten
54cad0b7a6
Updating nuget to 4.0.0-rc-2037
2016-10-28 17:13:29 -07:00
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
Livar Cunha
d61ebd3087
Making OutputPathCommandResolver work with MSBuild.
2016-10-24 12:41:27 -07:00
Livar Cunha
22bc479927
Updating msbuild to 15.1.319-preview5
2016-10-19 12:43:21 -07:00
Livar Cunha
391d04c67a
Adding net46 to some of our libraries back, so that we can run binding-redirect tests again. We need those tests for tool and we need to keep them running.
2016-10-16 18:44:07 -07:00
Livar Cunha
7601f66328
Reducing the test method name sizes in an attempt to get it passing on Windows.
2016-10-16 18:42:57 -07:00
Livar Cunha
dab19ce57c
Fixing msbuild.exe casing
2016-10-14 14:58:36 -07:00
Livar Cunha
8ad1982013
Handling configuration when the env variable is not set.
2016-10-14 14:36:09 -07:00
Livar Cunha
58bc3b5853
Making the tests aware of the Configuration used in the build.
2016-10-14 12:56:18 -07:00
Livar Cunha
99d6b1fd6d
Adding some more tracing to tools command resolvers.
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
Justin Emgarten
53b436c5d5
Updating NuGet to 3.6.0-rc-1984
2016-10-13 19:31:15 -07:00
Justin Emgarten
f2eef338db
Updating NuGet to 3.6.0-rc-1979
2016-10-12 00:49:44 -07:00