Commit graph

3416 commits

Author SHA1 Message Date
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
66dd155160 Merge pull request #4031 from dotnet/piotrpMSFT/remove_dotnet-build.tests
remove dotnet-build.tests
2016-08-10 15:52:51 -04:00
PiotrP
a7d594049b Remove dotnet-build.tests
This capability is being replaced by MSBuild, and the project.json tests are very long running.
2016-08-10 11:55:56 -07:00
Eric Erhardt
ec2cd254f1 Merge pull request #4027 from eerhardt/msbuild-reenableBuild3Tests
Fix and re-enable build3 tests for windows and OSX
2016-08-10 11:13:39 -05:00
Eric Erhardt
2b741bca27 Fix and re-enable build3 tests. 2016-08-10 09:21:43 -05:00
Piotr Puszkiewicz
6b04136c31 Merge pull request #4024 from dotnet/piotrpMSFT/redistProj
src/redist/project.json
2016-08-09 18:19:12 -04: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
Piotr Puszkiewicz
912a47f672 Merge pull request #4020 from dotnet/piotrpMSFT/msbuild872
Move CLI Build to MSBuild 00024-160610
2016-08-09 13:10:50 -04:00
Eric Erhardt
e6ed1bd32f Completely remove buildtools from our build. 2016-08-09 10:28:51 -05: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
Eric Erhardt
38d18eab4d Fix dotnet-install.ps1.
Allow directories named "publish" in .gitignore.
Add files to the .sln.
2016-08-09 08:28:53 -05:00
Eric Erhardt
d5179f9168 Temporarily copy the dotnet/buildtools tasks we use into dotnet/cli to allow us to move up to a newer MSBuild. 2016-08-09 08:28:23 -05:00
Piotr Puszkiewicz
16692fc75c Remove CDN caching from version files 2016-08-09 02:41:12 -07:00
Piotr Puszkiewicz
5f60c2cf37 Move CLI Build to MSBuild 00024-160610 2016-08-09 01:12:29 -07:00
Piotr Puszkiewicz
6a8c8b2dda Merge pull request #4019 from dotnet/piotrpMSFT/msbuild872
Fix for #4018
2016-08-09 04:11:41 -04:00
Piotr Puszkiewicz
f09903d5c6 Copy MSBuild.exe into root dir to work around MSBUILD #872 2016-08-09 00:28:41 -07:00
Piotr Puszkiewicz
9009c6512c Merge pull request #4018 from dotnet/piotrpMSFT/msbuildUpdate
Update MSBUILD
2016-08-08 18:34:28 -04:00
PiotrP
359f274626 Workaround for msbuild #872 2016-08-08 14:35:09 -07:00
PiotrP
f277103831 Make GivenThatICopyLibraryAssets repeatable 2016-08-08 13:44:44 -07:00
Piotr Puszkiewicz
79648f9ccb Update stage0 msbuild 2016-08-07 01:51:47 -07: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
Eric Erhardt
38cf24a211 Merge pull request #3979 from eerhardt/msbuild-DependencyModel13
Add netstandard1.3 TFM to DependencyModel
2016-08-02 15:37:42 -05:00
Piotr Puszkiewicz
f277393157 Merge pull request #3980 from dotnet/piotrpMSFT/sign-build3
Fix invocation of insignia.exe -ab
2016-08-02 16:21:53 -04: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
Piotr Puszkiewicz
479399ff47 Fix invocation of insignia.exe -ab
http://wixtoolset.org/documentation/manual/v3/overview/insignia.html
2016-08-02 12:59:45 -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
Piotr Puszkiewicz
6aef420ba8 Merge pull request #3976 from dotnet/piotrpMSFT/sign-build3
Add missing dependencies to bundle targets
2016-08-02 13:49:23 -04:00
Piotr Puszkiewicz
253d232943 Add missing dependencies to bundle targets 2016-08-01 23:25:28 -07:00
Eric Erhardt
01283e3df9 Fixing a small spelling error 2016-08-01 23:03:10 -05:00
Piotr Puszkiewicz
997797b01a Merge pull request #3975 from dotnet/piotrpMSFT/removenugethacks
Remove temporary hacks from new NuGet
2016-08-01 22:59:15 -04:00
Piotr Puszkiewicz
52ed2b090f Remove temporary hacks from new NuGet 2016-08-01 19:11:40 -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
911f7a9759 Merge pull request #3971 from eerhardt/msbuild-UpdateNuGet
Update NuGet to 3.5.0-rc1-1697
2016-08-01 16:15:56 -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
Eric Erhardt
e3f0a859f8 Update README to kick off a build 2016-07-29 14:31:16 -05:00
Livar
7d74c31aa8 Merge pull request #3963 from livarcocc/compare_ignore_case
Compare ignore case
2016-07-29 00:31:22 -07:00
Livar Cunha
89a6bdd197 Disabling the msbuild E2E test. 2016-07-28 23:35:46 -07:00
Livar Cunha
06bbaf7fb5 Disabling build3 tests. 2016-07-28 23:13:19 -07:00
Piotr Puszkiewicz
336b97212f Crossgen package name casing 2016-07-28 22:29:29 -07:00
Livar Cunha
174eeed45e Adding System namespace to packagedependencyprovidertest, required by StringComparer. 2016-07-28 21:57:00 -07:00
Livar Cunha
dca7a4fd41 Need to restore the build tools CLI before trying to use it. Now we use it for both restore/publish of build tools. 2016-07-28 21:43:09 -07:00
Livar Cunha
da688f71c2 Fixing the path to the Build Tools CLI for publisbing tools_runtime 2016-07-28 21:27:46 -07: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
Piotr Puszkiewicz
ad66b8935c Merge pull request #3957 from dotnet/piotrpMSFT/fixbuild
print all files
2016-07-28 03:03:12 -04:00