Commit graph

35 commits

Author SHA1 Message Date
Livar Cunha
cfd0874c96 Modified test assets and added the new rids back as badges and CI. Still need to update tests. 2017-03-17 20:32:50 -07:00
Livar Cunha
ab28591c10 Replacing hard coded references to shared framework version. 2017-03-06 21:25:42 -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
d847963ab7 Fix bad updates 2017-03-02 20:09:37 -08:00
Piotr Puszkiewicz
19e486bcb2 Version as Metadata in TestAssets 2017-03-02 19:52:26 -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
Eric Erhardt
b64068291b Remove OpenSUSE13 and Fedora23 since they are end of lifed. 2017-03-01 15:27:50 -06:00
Krzysztof Wicher
3e2b28f9eb fix a warning in a test asset causing test failure 2017-01-18 13:41:57 -08:00
Livar Cunha
3a4e23e373 Updating the SDK to an SDK that includes globing for source and resources implicitly. 2017-01-05 12:31:48 -08:00
Eric Erhardt
a80e8fa636 Update Microsoft.NETCore.App to 1.0.3. 2017-01-05 08:57:53 -06:00
Livar Cunha
fadacc0aac Updating the projects files in the repo to use the SDK attribute. 2016-12-20 15:52:50 -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
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
Piotr Puszkiewicz
24596b23ae 02->2 2016-11-04 10:30:00 -07:00
Piotr Puszkiewicz
6e5527ba4c Final Version Numbers 2016-11-04 10:09:22 -07:00
seancpeters
40c34f891a Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions (#4585)
* Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions

* Fixed merge conflicts. Had to re-update the Sdk version in one place.

* re-migrate dotnet.dll

* Revert Performance Test Projects

* Fix test test

* Add missing WithRuntime

* Disable failing test test
2016-11-03 22:12:33 -07:00
Livar Cunha
c2f60cede4 Updating the SDK to the latest. 2016-11-01 00:29:54 -07:00
Justin Goshi
68afda8e4d Handle "runtimes" section (#4503)
* Migrate "runtimes" section as a RuntimeIdentifiers property in the resulting csproj file. Also do not call restore3 from publish3 anymore.

* Fix up the publish3 tests to call restore3 first and the csproj files to have RuntimeIdentifiers
2016-10-26 22:23:40 +00:00
Eric Erhardt
33ec55aee3 Fix dotnet run3 --project to pass the project to msbuild.
Also update Microsoft.NET.Sdk to 1.0.0-alpha-20161026-2 since this has the corresponding fix needed for https://github.com/dotnet/sdk/issues/301.
2016-10-26 00:04:40 -05:00
Livar Cunha
368d7a19af Updating the SDK version to the latest. 2016-10-19 16:21:54 -07:00
Livar Cunha
e2e72a9662 Updating the msbuild templates in the CLI to use TargetFramework (singular). 2016-10-18 15:02:35 -07:00
Eric Erhardt
633b56e448 Update Microsoft.NETCore.Sdk => Microsoft.NET.Sdk. 2016-10-10 14:04:30 -05:00
Livar Cunha
167470b1c9 Updating the SDK version, which we need to pick up the NuGetTargetMoniker fix. 2016-10-06 18:31:15 -07:00
Rohit Agrawal
28bd507f40 update nuget and sdk to 3.6.0-rc-1954 and 1.0.0-alpha-20161006-3 (#4332) 2016-10-06 09:35:58 -07:00
Livar Cunha
bfc1f82d68 Fixing the tools item name in csproj. Nuget used a different one then was originally at the spec. 2016-10-05 15:27:30 -07:00
Livar Cunha
1570e0fde4 Moving the ProjectToolsCommandResolver to dotnet out of Cli.Utils because of the dependency on Microsoft.Build. Also added a EndToEnd test for tools ref using the MSBuildTestApp. 2016-10-04 18:59:44 -07:00
Livar Cunha
5f3da6428d Testing out a theory that setting the output path will solve this problem. 2016-09-30 15:52:22 -07:00
Livar Cunha
27b5abfc36 Trying out with the latest SDK. 2016-09-30 12:03:03 -07:00
Livar Cunha
4173d19b3c Pinning the SDK version for migrated apps. 2016-09-30 09:27:16 -07:00
Livar Cunha
29b197534c Updating to a new SDK and adding a work around to set project.lock.json for migrated projects. 2016-09-30 09:27:15 -07:00
Livar Cunha
715f1f6a10 Addressing code review comments. 2016-09-30 09:27:15 -07:00
Livar Cunha
c41b35f06f Updating tests to reflect msbuild projects running without project.json. 2016-09-30 09:25:11 -07:00
Livar Cunha
2bbef9328b Removing project.json from msbuild template and msbuild test app. 2016-09-30 09:25:11 -07:00
Eric Erhardt
72c59c4d05 Add test for MSBuild End to End. 2016-07-21 16:02:57 -05:00
Bryan Thornbury
400e1db3b9 dotnet-build3 Adding msbuild execution command to cli 2016-06-23 13:57:33 -07:00