Commit graph

1164 commits

Author SHA1 Message Date
Bryan Thornbury
709f7b7d14 Enable Cross Publishing and add tests
WIP

WIP

WIP

Test out not publishing runtimeAssets

WIP

WiP x-publish

update cross-publish-test

Update Cross Publish tests

remove --config from restore

fix build

update cross publish tests

fix test compilation error

test failure fix

fix test failure

update tests

tracing

fix desktop publishing

do publish with no build, call build manually

fix

Make host publish optional, fix faux libraries?

update

Cross Publish test working

try changing test to netcore.app

fallback to host from current platform

revert change to project.json to target Microsoft.NETCore.App

fallback to compilation build output

update kestrel standalone app project.json

Make project tools command resolver test more self-contained.

make Kestrel Standalone restore against N-1
2016-04-12 13:00:04 -07:00
Senthil
62239926a8 Fix servicing policies 2016-04-12 12:09:18 -07:00
schellap
351245bce3 CoreHost.exe hostpolicy should be picked sxs 2016-04-12 09:49:49 -07:00
Eric Erhardt
ed9309b90b Merge pull request #2399 from eerhardt/NewRoslyn
Update Roslyn to 1.3.0-beta1-20160410-01.
2016-04-12 08:57:54 -05:00
Senthil
38be724c3b Make interface untyped 2016-04-11 19:58:14 -07:00
Senthil
49db7b246b Merge pull request #2409 from schellap/rcfg
Add runtimeconfig to corehost as well
2016-04-11 15:21:04 -07:00
Piotr Puszkiewicz
a7ae7b0091 Merge pull request #2328 from danquirk/MoveTelemetryToDotNet
Move telemetry dependency out of Utils and into dotnet
2016-04-11 15:17:19 -07:00
Senthil
35380c3e77 Add runtimeconfig to corehost as well 2016-04-11 12:37:11 -07:00
Eric Erhardt
c41a0a0ceb Update Roslyn to 1.3.0-beta1-20160410-01. 2016-04-11 09:35:09 -05:00
Bryan Thornbury
d3d64a4033 fix the race condition when generating deps.json, and add some coverage of this scenario
update reporter to verbose

fix

fix usings for test

update the test
2016-04-08 18:16:49 -07:00
Andrew Stanton-Nurse
803fef6a8b fix equality issue in DependencyContextLoader (#2379)
When checking if the provided assembly is the Entry Point Assembly, we
previously just checked if the AssemblyNames were equal, but it turns
out AssemblyName doesn't implement Equals, so it was using Reference
Equality, which fails. This change uses Assembly.Equals, which has an
Equals implementation that works.

Also adds some tests to ensure it's working.

This unblocks scenarios where the EntityFramework `dotnet-ef` command
was trying to read DependencyContext.Default but receiving a null
reference.
2016-04-08 15:33:32 -07:00
Troy Dai
3d157d0ec8 Merge pull request #2363 from dotnet/troy/2344
Stop adding default desktop assembly reference repeatedly.
2016-04-08 15:25:39 -07:00
Pawel Kadluczka
44be0cb3c0 Merge pull request #2358 from dotnet/pawelka/outname_pack
Enabling creating packages with different names than target libraries
2016-04-08 14:24:29 -07:00
Troy Dai
031862dc05 Avoid add default desktop references repeatedly 2016-04-08 14:15:17 -07:00
Senthil
95bcf436fa Merge pull request #2360 from schellap/rollfwd
Roll forward for FX and additional paths
2016-04-08 13:52:36 -07:00
Eric Erhardt
e45e4bd991 Merge pull request #2376 from eerhardt/NewRoslyn
Update Roslyn to 1.3.0-beta1-20160406-08
2016-04-08 15:34:47 -05:00
Eric Erhardt
661b9c7627 Update Roslyn to 1.3.0-beta1-20160406-08 2016-04-08 14:15:57 -05:00
Eric Erhardt
9f61ad51aa Check if runtimeConfigPath exists before reading the file in IsPortableApp.
If it doesn't exist, then it isn't a portable app.
2016-04-08 12:52:57 -05:00
Bryan Thornbury
0eb527a7c1 change ordering of the args when invoking dotnet exec for xunit. Fix a bug in the host logic 2016-04-08 09:32:55 -05:00
Bryan Thornbury
1f5116addf add --runtimeconfig to known opts 2016-04-08 09:32:54 -05:00
Bryan Thornbury
34d2445916 Add --runtimeconfig to the hostfxr, and use this option for the xunit scenario. 2016-04-08 09:32:53 -05:00
Eric Erhardt
6fa859a354 Fix ProjectDependenciesCommandResolver for portable test apps.
Update to dotnet-test-xunit to latest.
2016-04-08 09:32:52 -05:00
Eric Erhardt
99371436f3 Consume NETCore.App 2016-04-08 09:27:23 -05:00
Piotr Puszkiewicz
85608e42cc Merge branch 'rel/1.0.0' into pawelka/outname_pack 2016-04-08 04:27:58 -07:00
Matt Ellis
d0ac16129d Update package dependencies to rc2-24008 2016-04-08 04:05:26 -07:00
Pavel Krymets
ddff3a256e Merge pull request #2342 from dotnet/pakrym/run-core-app
Add netcoreapp as default tfm to run
2016-04-07 20:11:08 -07:00
Senthil
392e8fe47d Roll forward for FX and additional paths 2016-04-07 18:23:48 -07:00
moozzyk
6a571e5b2a Enabling creating packages with different names than target libraries
Addresses #2322
2016-04-07 16:06:59 -07:00
Sridhar Periyasamy
5768f4c973 Merge pull request #2297 from Sridhar-MS/fix-2126
Execute project dependency command from output directory for Desktop.
2016-04-07 13:46:30 -07:00
Pavel Krymets
ed05e164fb Merge pull request #2337 from dotnet/pakrym/hasruntimeoutput
Bring `has runtime output` check back
2016-04-07 13:37:09 -07:00
Pavel Krymets
0bc7380bdb Add netcoreapp as default tfm to run 2016-04-07 11:51:41 -07:00
Pranav K
9efebf8ef9 Merge pull request #2296 from dotnet/prkrishn/update-more-packages
Update to the latest AspNet packages
2016-04-07 11:04:45 -07:00
Sridhar Periyasamy
4de28dc58b Fix windows x86 test failure.
Use the correct rid for windows x86 in the test.
2016-04-07 10:54:31 -07:00
Pavel Krymets
13aee118e9 Bring has runtime output back 2016-04-07 10:22:48 -07:00
Pavel Krymets
a1d4641b8e Merge pull request #2329 from natemcmaster/namc/dep-context
Fix bug in dependency context adding assets to wrong groups
2016-04-07 09:57:33 -07:00
Peter Marcu
aa88de1e6c Merge pull request #2198 from dotnet/Petermarcu-update-netcoreapp
Update project.json template to be netcoreapp1.0
2016-04-07 09:07:37 -07:00
Bryan Thornbury
3e903438b3 Merge pull request #2319 from dotnet/brthor/remove-nuget-config
Remove NuGet.config from the default dotnet new drop.
2016-04-06 22:35:12 -07:00
Nate McMaster
bfdedfd75c Fix #2327 - fix bug in dependency context adding assets to wrong groups 2016-04-06 20:35:56 -07:00
Senthil
76610c4cd4 Merge pull request #2316 from schellap/rollfwd
Perform prerelease roll forward for FX and servicing
2016-04-06 20:21:15 -07:00
Senthil
29183b045e Merge pull request #2301 from schellap/dev-json
Improve logging when hostpolicy is not found
2016-04-06 19:26:33 -07:00
Pranav K
e51dd1594c Update to the latest AspNet packages 2016-04-06 18:11:58 -07:00
Senthil
7100866b1c Do prerelease roll forward for all probe paths
-- default: false
2016-04-06 17:35:46 -07:00
Dan Quirk
3045ce37fc Move telemetry dependency out of Utils and into dotnet 2016-04-06 17:02:27 -07:00
Eric Erhardt
890e9840d3 Merge pull request #2320 from eerhardt/NewRoslyn
Update Roslyn to 1.3.0-beta1-20160405-05
2016-04-06 18:13:22 -05:00
Bryan Thornbury
6ec25e9f30 Merge pull request #2214 from dotnet/brthor/fix-fsc-template
Add imports to the fsharp dotnet new template
2016-04-06 15:38:37 -07:00
Eric Erhardt
ccd180c684 Update Roslyn to 1.3.0-beta1-20160405-05 2016-04-06 16:42:11 -05:00
Senthil
b7561e8836 Improve logging when hostpolicy is not found
- Detect interface breaks between hostpolicy and hostfxr
2016-04-06 14:35:26 -07:00
Bryan Thornbury
939366165f Remove NuGet.config from the default dotnet new drop. Patch the tests to cover this gap until corefx is on nuget.org 2016-04-06 14:34:39 -07:00
Senthil
584fdea49e Merge pull request #2271 from schellap/master
Add ApiSets to process DLL search dirs
2016-04-06 13:36:12 -07:00
Pavel Krymets
f49d95c47d Merge pull request #2306 from dotnet/pakrym/platform-in-target
Alow type platform to be in target dependencies
2016-04-06 13:26:12 -07:00
Senthil
bcef2372a2 Add ApiSets to PATH
-- So CoreCLR load of PInvoke can actually see these
      dependencies.
Add DllDirectory so CoreCLR itself can be loaded.
2016-04-06 11:38:52 -07:00
Pavel Krymets
567d1fa19d Alow type platform to be in target dependencies 2016-04-06 10:46:52 -07:00
Wes Haggard
3ab4a30eb8 Add support for pkgprojs in cli repp
- Move src\corehost\packaging to pkg\ directory.
- Renamed PackageCoreHost to PackagePkgProjects and removed blocker
- Updated copy of packages in PackagePkgProjects target to override (because there is no proper clean)
- Update dir.props to match the package version for the runtime.json
- Moved all CoreHost packages under  Microsoft.NETCore.DotNetHost directory
- Add the license files to the packages

Add support for building Microsoft.NETCore.App meta-package
- VersionNumber will be of form 1.0.0-rc2-<NETSTandard.Library build#>-<CLIbuild#>
EX: 1.0.0-rc2-23931-002203
2016-04-06 10:34:23 -07:00
Jan Kotas
722cd3b681 Merge pull request #2240 from jkotas/remove-r2r-workaround
Remove ReadyToRun workaround
2016-04-05 21:30:35 -10:00
Sridhar Periyasamy
1db2c08fb5 Execute project dependency command from output directory for Desktop.
Created a new command resolver called OutputPathCommandResolver which
reolves a command from the project build output directory.

Made changes ProjectDependenciesCommandFactory to use
OutputPathCommandResolver if the target framework is Desktop.

Fixes - #2126

Still need to add tests.
2016-04-05 20:13:06 -07:00
Eric Erhardt
965547bd8a Merge pull request #2145 from dotnet/lakshanf/issue2066/telemetry
Lakshanf/issue2066/telemetry
2016-04-05 19:37:58 -05:00
Eric Erhardt
5e617bbb43 Merge pull request #2283 from eerhardt/NewNuGet
Update NuGet to 3.5.0-beta-1130
2016-04-05 15:29:10 -05:00
Eric Erhardt
ed82fd2e66 Update NuGet to 3.5.0-beta-1130 2016-04-05 13:42:16 -05:00
Livar Cunha
40cd8650ce Removing linq from projectmodel net45 dependencies. It got there accidently. 2016-04-05 11:14:36 -07:00
Troy Dai
cb14076b38 Merge pull request #2249 from dotnet/troy/2200
Use default version for unresolved MSBuild reference
2016-04-05 09:05:18 -07:00
Troy Dai
e63c0f82c9 Use default version for unresolved MSBuild reference 2016-04-05 08:32:58 -07:00
Pavel Krymets
8831bb4a8b Do not trim refs 2016-04-05 08:06:17 -07:00
Dan Quirk
0d067be964 Use static member 2016-04-04 18:58:22 -07:00
Dan Quirk
b5e1042d06 Use InternalsVisibleTo for testing 2016-04-04 17:33:09 -07:00
Dan Quirk
3e4edf1688 CR feedback part 1 2016-04-04 16:18:47 -07:00
Lakshan Fernando
25745d9d4e Implemented Telemetry class via an interface for test ease 2016-04-04 15:26:06 -07:00
Lakshan Fernando
d9e169e77a Stopped collecting command arguments due to PII concerns 2016-04-04 15:26:06 -07:00
Lakshan Fernando
e9a6c4350a added comment to the instrumentation key field 2016-04-04 15:26:06 -07:00
Lakshan Fernando
689a72ffb5 incorporate CR feedback for the first PR 2016-04-04 15:26:06 -07:00
Lakshan Fernando
6b84a10e57 Telemetry PR 2016-04-04 15:26:06 -07:00
Peter Marcu
d8858e4d6b Update project.json template to be netcoreapp1.0
It should be time, now that RID inference is off, to update dotnet new to finally use netcoreapp1.0.
2016-04-04 14:43:50 -07:00
Livar Cunha
7b209e5603 Moved ProjectModel to json.net for GlobalSettings and Project.json. Kept LockFileReader using the old API as I don't have the cycles to add the tests for it at the moment.
Added unit tests covering parsing of Json for all the pieces of the project.json

Added a RawRuntimeOptions to Project and made Executable deserialize that into the runtimeOptions of runtimeconfig.json

Added tests to cover copying runtimeoptions during dotnet build.
2016-04-04 12:11:27 -07:00
Jan Kotas
5673647064 Remove ReadyToRun workaround 2016-04-03 09:01:59 -07:00
Justin Emgarten
9c31501deb Updating nuget to beta-1123 2016-04-01 21:09:05 -07:00
schellap
f5411abdf0 Support runtimeconfig.dev json 2016-04-01 19:32:02 -07:00
Bryan Thornbury
8370effbb0 Add imports to the fsharp dotnet new template 2016-04-01 15:35:12 -07:00
Eric Erhardt
47530fce56 Merge pull request #2188 from eerhardt/UpdateRoslyn
Updating Roslyn packages to 1.3.0-beta1-20160329-01.
2016-04-01 09:37:01 -05:00
Senthil
be1c55f061 Merge pull request #2186 from schellap/bom
Strip BOM from JSON file streams
2016-04-01 06:32:44 -07:00
Senthil
23e3adb1a3 Strip BOM from JSON file streams 2016-04-01 05:30:23 -07:00
Senthil
29b567db3f Merge pull request #2156 from schellap/shared-paths2
Probe shared locations
2016-04-01 00:03:09 -07:00
Eric Erhardt
a2a776ac7b Updating Roslyn packages to 1.3.0-beta1-20160329-01. 2016-04-01 01:24:45 -05:00
Justin Emgarten
219a0539b0 Updating to NuGet 1105 2016-03-31 18:13:25 -07:00
Troy Dai
9f23b7adf5 Merge branch 'troy/xp' into rel/1.0.0 2016-03-31 17:16:41 -07:00
schellap
3d691eb928 Probe shared locations 2016-03-31 16:58:17 -07:00
Pavel Krymets
e4cdc250e9 Merge pull request #2177 from dotnet/pakrym/disable-json-message
Do not write json error message to stderr
2016-03-31 16:31:07 -07:00
Pavel Krymets
8d1ddcdf2d Do not write json error message to stderr 2016-03-31 14:39:33 -07:00
Bryan
0fd81e0a2d Extract dotnet-compile-fsc into a standalone command
Add basic Tests for dotnet-compile-fsc

Package Targets execute before TestTargets. Use Generated Nuget Packages in TestTargets. Generate Nuget packages on all platforms, and in C#

Fix bug in dotnet-restore, change fsharp new template, add support for native assets in DependencyContextCsvReader

copy fsc.exe to temp directory instead of package cache

fix rebase error

fix issue

fixes

fixes

fix

temporarily disable debian package e2e testing

fixes

bump fsc version

update fsc version

fix rebase errors

WIP update fsc tool

WIP, rebased and working again, need to solve issues with System.CommandLine

Working state for packaged, command, fsc.exe bugging out with dlopen(, 1): no suitable image found.

execute fsc like a unpublished standalone app

fixup after rebase

working? internet is out

working

cleanup

More cleanup, and run the debian package tests during the Test phase of the build.

update FSharp Test Projects NetStandard Library Version

Update Version Suffix when packing TestPackages. This will enable packing with the right dependency versions on Windows.

update dotnet-test version

Undo the reordering of the build

fix test package project pathsj

ignore net451 build failures for test packages which we need to build on non-windows

update dependency of desktop test app

add dotnetcli feed to nuget config for fsharp dotnet new

update deps after rebase

update dependency of dotnet-compile-fsc

pass args before commandPath when using muxer for tools

adjust testpackage cleaning not to clean packages which are also generated as part of the product from the nuget cache.

undo

Pass projectJson to pack instead of using WorkingDirectory

fix path separators using depsjsoncommandresolver on windows, fix building only specific frameworks for testpackages on non-windows.

PR Feedback

rebase

overwrite fsc runtimeconfig
2016-03-31 14:01:08 -07:00
Troy Dai
e176c1d3b9 Remove fragment file's involvement in design time scenarios 2016-03-31 13:57:36 -07:00
Pavel Krymets
429eb93cd9 Merge pull request #2160 from dotnet/pakrym/no-arg-net451
Pass no additional arguments to net451 app in dotnet run
2016-03-31 11:23:31 -07:00
Pavel Krymets
7e73e5c379 Pass no additional arguments to net451 app 2016-03-31 10:35:42 -07:00
eerhardt
3afd85068a Updating dependencies from last known good builds 2016-03-31 11:57:21 -05:00
Senthil
1428eb81cf Merge pull request #2139 from schellap/master
Add clarifying message on JSON exception
2016-03-31 01:05:42 -07:00
Bryan Thornbury
164a235a20 Merge pull request #2151 from dotnet/brthor/remove-oob-commands
Remove OOB Commands and Pdbs from stage2
2016-03-30 21:28:27 -07:00
Senthil
9c67627b43 Merge pull request #2150 from schellap/simple
Disable corehost packaging in VSO
2016-03-30 20:33:10 -07:00
Mihai Codoban
4c84e686d0 Avoid duplicate messages 2016-03-30 19:24:43 -07:00
Troy Dai
8a3ddc9c8a Remove MSBuildProjectPath property 2016-03-30 19:24:43 -07:00
Mihai Codoban
b7ca1d14bd Distinguish between the msbuild project path and csproj file path 2016-03-30 19:24:43 -07:00
Mihai Codoban
2e78b9ae60 Revert "MSBuildProjectDescriptions has dedicated property for the csproj path"
This reverts commit a95e20d96480dac3010c8403e04bd716fba2cc5b.
2016-03-30 19:24:43 -07:00
Mihai Codoban
54278c294e Transform lock file reader exceptions into diagnostics 2016-03-30 19:24:43 -07:00
Mihai Codoban
9cc3d088f0 MSBuildProjectDescriptions has dedicated property for the csproj path 2016-03-30 19:24:43 -07:00