Commit graph

57 commits

Author SHA1 Message Date
Eric Erhardt
1febe48d71 Updating CoreFX version to rc2-23924 2016-03-24 16:05:24 -05:00
Eric Erhardt
a5813791d5 Updating CoreFX version to rc2-23923 2016-03-24 16:04:37 -05:00
Eric Erhardt
3186432ebd Fix up the project.json files for CoreFX build rc2-23922.
- ProjectModel uses AssemblyLoadContext which is only available in netstandard1.5. Moving ProjectModel and all its dependencies up to netstandard1.5.
- Work around our dependencies still being on old CoreFX builds by hoisting System.Runtime.Serialization.Primitives, System.Private.DataContractSerialization, System.Linq.Expressions, and System.Xml.XmlSerializer references to the current version.
2016-03-24 16:03:19 -05:00
eerhardt
9bc478660a Updating dependencies from last known good builds 2016-03-24 16:02:33 -05:00
Eric Erhardt
964318b291 Revert "Update the .xproj files to reference the "DotNet" targets and props instead of "DNX"."
This reverts commit 4304ca9848.
2016-03-16 11:44:09 -05:00
Eric Erhardt
4304ca9848 Update the .xproj files to reference the "DotNet" targets and props instead of "DNX". 2016-03-15 13:59:00 -05:00
Eric Erhardt
ce3c594880 Removing project.json dependency workarounds that were needed for CoreFX 23901 build. 2016-03-15 12:34:32 -05:00
eerhardt
8953400eee Updating dependencies from last known good builds 2016-03-14 17:58:13 -05:00
Andrew Stanton-Nurse
d08e83d5db add support for portable application layout 2016-03-12 11:52:29 -08:00
Pavel Krymets
9631ba8927 Generate actual deps.json file 2016-03-09 14:11:43 -08:00
Andrew Stanton-Nurse
12dd8d6112 fix bad merge that lost removal of net45 from portable app test 2016-03-08 15:03:04 -08:00
Andrew Stanton-Nurse
7cc90d9ad1 Update dotnet-build to produce portable layout
dotnet-build will produce a deps file for portable builds, and will now
create "runnable" outputs for RID-less targets

the outputs won't actually be runnable today because we need corehost
changes and to generate a deps.json file for corehost to use.
2016-03-08 11:46:15 -08:00
Livar Cunha
6705585a67 Updating test projects to the lastest version of dotnet-test-xunit runner. 2016-03-07 14:55:39 -08:00
Eric Erhardt
6468b14e1d Move to CoreFX build rc2-23901
Update .exe's project.json Target Framework from dnxcore50 to netstandardapp1.5.
Update .dll's project.json Target Framework from dnxcore50 to netstandard1.3.

Adding workaround for DataContractSerialization to src\dotnet\project.json to fix crossgen issue.
Build 23901 has a dependency issue that doesn't allow the runtime.any.System.Private.DataContractSerialization
package to be restored. When we move to a new build of CoreFX we should take this workaround out.
2016-03-03 16:41:55 -06:00
Livar Cunha
4108920510 Updating tests to use the latest version of dotnet-test-xunit, which supports debugging from VS. Also updating our xproj files so that we can build the CLI from VS using the CLI. 2016-03-01 16:28:10 -08:00
Livar Cunha
b14881d303 Removing net 461 from the build tests, as we are also missing that framework from our VSO machines at the moment. 2016-02-26 14:53:27 -08:00
Livar Cunha
58b8e332c1 The multitarget framework build tests is failing in VSO for net20 and net40 because it requires specific things installed at the machine. Removing the tests for these two frameworks. 2016-02-25 11:18:28 -08:00
David Fowler
6dc5efb0e2 Merge pull request #1513 from discostu105/rel/1.0.0
Fix net20 compatibility
2016-02-24 21:41:40 -08:00
Pavel Krymets
1bfd7725b0 Fix wrapped project paht resolution 2016-02-24 16:40:22 -08:00
discostu105
af5aaea6d0 assert on Should().Fail() on non-windows platforms for desktop frameworks 2016-02-24 14:19:21 +01:00
discostu105
5ad60df96a don't compile desktop framework targets on non-windows 2016-02-23 18:03:04 +01:00
discostu105
d0d3a629a5 added unit test. made if condition easier to understand. 2016-02-23 15:53:51 +01:00
David Fowler
ed16632a33 Flow the version suffix via pack as well 2016-02-18 02:27:35 -08:00
David Fowler
c941162b17 Fixed the test names 2016-02-18 01:12:24 -08:00
David Fowler
69b5e3f815 Fixing versions
- Added --version-suffix to build and publish
- Support reading DOTNET_* version variables everywhere versions can be read
- Show the commit sha in dotnet --version
- Added tests that check the assembly output version
- Set DOTNET_BUILD_VERSION when producing the CLI app itself so that it has the version information stamped in for help.
2016-02-18 01:10:07 -08:00
Sridhar Periyasamy
278475fdce Update IncrementalTestsOnCultureSpecificResource.cs 2016-02-16 15:41:36 -08:00
Sridhar Periyasamy
9ec8556d24 Rebase with the latest sources and fix the tests. 2016-02-16 11:26:40 -08:00
Sridhar Periyasamy
ab455e6bb9 Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into test-fx 2016-02-16 09:58:20 -08:00
David Fowler
129442923a Updated to a newer version of NuGet
- Update the newest nuget
- Filter out build dependencies from the project resolver based on hte lock file
- Fix more erroneous build dependencies
2016-02-15 18:39:29 -08:00
Sridhar Periyasamy
2a94a1e384 Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into test-fx
Conflicts:
	Microsoft.DotNet.Cli.sln
	scripts/dockerbuild.sh
	scripts/test/setup/build-test-prerequisites.ps1
	test/dotnet-build.Tests/IncrementalTestBase.cs
	test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs
	test/dotnet-publish.Tests/project.json
2016-02-12 17:26:58 -08:00
Piotr Puszkiewicz
82bbd22d46 Merge pull request #1272 from cdmihai/cdmihai/noDependencies
Add --no-dependency flag to build
2016-02-12 10:59:54 -08:00
Sridhar Periyasamy
96e425f8bb Fix build breaks and some 'build' tests. 2016-02-11 15:55:37 -08:00
Sridhar Periyasamy
f86952cf1d Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into test-fx 2016-02-11 14:22:24 -08:00
Sridhar Periyasamy
9695fbfeda Refactor 'publish' and 'build' tests to use the TestFramework 2016-02-11 14:17:20 -08:00
Andrew Stanton-Nurse
236fcd8f95 update everyone to 23811
add a little hackiness to the build script to use 23811 in the stage 0 as well
2016-02-11 10:38:59 -08:00
Mihai Codoban
a0990a518c Add --no-dependency flag to build 2016-02-10 15:35:27 -08:00
Pavel Krymets
4462dc21f8 Do not search for runtime output in dependencies 2016-02-10 15:20:08 -08:00
Eric Erhardt
74d8051f79 Bump CoreFx to rc2-23810 2016-02-10 13:50:28 -06:00
Piotr Puszkiewicz
48797ea80a Bump CoreFx to rc2-23808
Workaround for issue 1294

Improve crossgen notifications
2016-02-09 15:49:45 -08:00
Pranav K
1d25d2574d Fix the paths at which CompileContext locates resgen outputs.
Fixes #1136
2016-02-09 14:29:25 -08:00
Pavel Krymets
7baf0d61c6 Merge pull request #1313 from dotnet/pakrym/paths2
Fix tests on OS X and add diagnostic message
2016-02-09 11:59:38 -08:00
Pavel Krymets
3f058d4f32 Fix tests and add diagnostic message 2016-02-09 10:58:36 -08:00
Bryan Thornbury
0b27dba299 Merge pull request #1240 from dotnet/brthor/stream_forwarding_changes
Stream Forwarding Changes.
2016-02-09 10:45:35 -08:00
Bryan Thornbury
0d5984ec6e Fix Incremental Test 2016-02-09 10:05:07 -08:00
Pavel Krymets
0f82ae37f3 Refactor output directory code 2016-02-09 08:52:59 -08:00
Eric Erhardt
3d14caceff Test directory refactoring step 1.
Moving TestProjects and TestPackages under root 'TestAssets' folder.

Partial fix #1250
2016-02-08 20:35:22 -06:00
Eric Erhardt
a7e9ee52c9 Update to .Net Core rc2-23805 2016-02-05 15:53:23 -06:00
Piotr Puszkiewicz
65c026afbf Merge pull request #1052 from cdmihai/cdmihai/HFSTimeStampBug
Allow false positive rebuilds when timestamp collision occurs
2016-02-04 17:15:04 -08:00
Mihai Codoban
6d1ff3af8c Allow false positive rebuilds when timestamp collision occurs
Fixes #965
2016-02-04 16:35:04 -08:00
Mihai Codoban
897c0fa0f0 Rename --force-incremental-unsafe flag to --no-incremental 2016-02-04 15:57:10 -08:00