Commit graph

5693 commits

Author SHA1 Message Date
Vijay Ramakrishnan
02434d975d Fixing the indentation 2017-04-03 13:24:55 -07:00
Vijay Ramakrishnan
91886ff9a4 Adding the feed for websdk 2017-04-03 12:02:59 -07:00
Vijay Ramakrishnan
eb5ec51919 Updating the websdk version 2017-04-03 10:46:03 -07:00
Eric Erhardt
4145c3304d Merge pull request #6181 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to beta-001863 (master)
2017-03-31 20:57:51 -05:00
Eric Erhardt
0d39a1656d Update CoreSetup to preview1-001887-00 2017-03-31 18:31:27 -05:00
Eric Erhardt
527ab6b47a Update CoreSetup to preview1-001875-00 2017-03-30 15:54:01 -05:00
Eric Erhardt
1f8b86d268 Merge pull request #6208 from eerhardt/FixDebTool
Fixing the reference to dotnet-deb-tool to be correct.
2017-03-30 15:49:11 -05:00
Eric Erhardt
56f2652406 Fixing the reference to dotnet-deb-tool to be correct.
No more using * versions.  Only specify the version in a single place.
2017-03-30 14:39:54 -05:00
Eric Erhardt
bbd388d328 Fix crossgen location on linux machines.
Microsoft.NETCore.App no longer pulls in distro-specific runtime packages on linux. Instead, it uses the portable 'linux-x64' runtime.
2017-03-29 17:48:22 -05:00
dotnet-bot
eecd983d80 Update CoreSetup to beta-001863 2017-03-29 21:29:20 +00:00
Livar
6866bc2f4a Merge pull request #6168 from mlorbetske/dev/mlorbe/UpdateToTemplateEngine166And20TemplateContent
Update to template engine build 166 and updates to 2.0 templates
2017-03-28 22:48:57 -07:00
mlorbetske
d8e1943c49 Take newer version of the engine 2017-03-28 20:53:27 -07:00
Livar
cd48c6af7e Merge pull request #6174 from svick/fix-links
Fixed broken links
2017-03-28 13:36:46 -07:00
Mike Lorbetske
be5c70cd30 Use a build that exists 2017-03-28 09:17:51 -07:00
Mike Lorbetske
3d6833b5f0 Update engine version 2017-03-28 08:17:01 -07:00
Petr Onderka
8eab3ad038 Fixed broken links 2017-03-28 15:50:05 +02:00
Mike Lorbetske
4c2435eeb9 Update engine version, fix test 2017-03-27 23:46:40 -07:00
Mike Lorbetske
19f89a2f73 Update engine version to get some more information about the CI failures 2017-03-27 21:22:49 -07:00
Mike Lorbetske
988f0c665d Take newer version of template engine 2017-03-27 20:31:17 -07:00
Mike Lorbetske
9bb88734ea Update to template engine build 166 and updates to 2.0 templates 2017-03-27 17:46:32 -07:00
Livar
3634da519a Merge pull request #6167 from dotnet/livarcocc-patch-1
Removing CMake from the CLI build requirements.
2017-03-27 15:53:16 -07:00
Livar
55f3a238ee Update developer-guide.md 2017-03-27 14:58:02 -07:00
Livar
8bb50f5638 Removing CMake from the CLI build requirements.
We needed that when we used to build the shared framework in the CLI. We don't need it anymore. Plus, we need a small change to kick off a build.
2017-03-27 14:57:32 -07:00
Livar
e01fbc941d Merge pull request #6160 from crummel/fixFolderCase
Make folder case consistent.
2017-03-27 13:52:30 -07:00
Chris Rummel
cd0fc7886c
Make folder case consistent.
This causes no build issues (because the .csproj uses the default wildcard include),
but prevents the repo from being pushed to VSO Git.
2017-03-27 14:59:40 -05:00
Livar
e09c33400c Merge pull request #6138 from livarcocc/tool_fallback_folder
Switched to using a FallbackPackagePathResolver to find the tool dll
2017-03-27 10:57:55 -07:00
Livar Cunha
b2116cd2e1 Addressing comments by adding a test covering the case where the tool assemblies are not found. 2017-03-26 21:52:27 -07:00
Livar
a0c0084359 Merge pull request #6149 from eerhardt/UseLinuxRuntime
Use the portable `linux-x64` runtime when building on Linux.
2017-03-24 16:19:04 -07:00
Nick Guerrera
fcd3c149f8 Merge pull request #6136 from nguerrera/vs-version-props
Package bundled version props in to a VS insertion nupkg
2017-03-24 15:56:04 -07:00
Eric Erhardt
a97b572e49 Use the portable linux-x64 runtime when building on Linux. 2017-03-24 16:19:52 -05:00
Eric Erhardt
dff66c1acb Update the .sln file to contain all the build logic in an organized way. 2017-03-24 16:19:50 -05:00
Nick Guerrera
5c6b5da017 Merge pull request #6145 from nguerrera/remove-fedora
Remove Fedora24 from CI rotation for now
2017-03-24 14:15:26 -07:00
Livar
9f186882b3 Merge pull request #6120 from dasMulli/bugfix/run-directory-arg
Allow directories as project arguments to run command.
2017-03-24 14:14:50 -07:00
Nick Guerrera
ac0fa56039 Remove Fedora24 from CI for now 2017-03-24 13:31:05 -07:00
Nick Guerrera
c3a6999392 Skip flaky test 2017-03-24 13:14:07 -07:00
Eric Erhardt
7bfc51f2b1 Format BundledRuntimes.props to use consistent whitespace. 2017-03-24 14:22:34 -05:00
Livar Cunha
a4300cc069 Improving the test slightly by checking that it is finding the correct path to the tool dll. 2017-03-24 12:17:27 -07:00
Livar Cunha
10e743e8e5 Switched to using a FallbackPackagePathResolver to find the tool dll, because now with Fallback folders, we can have the tool dll in the fallback folder but its assets file in the user nuget cache. This happens because Nuget never writes to the fallback folder, including the tool's assets file that it generates during restore. 2017-03-24 12:17:27 -07:00
Livar
b2ac1cf8df Merge pull request #6134 from jonsequitur/stop-splitting-tokens-when-option-is-not-valid
update CommandLineParser version for more selective option splitting
2017-03-24 12:14:47 -07:00
Livar
47158e7a5d Merge pull request #6135 from ellismg/update-dependencies
Update dependencies
2017-03-24 12:14:08 -07:00
Matt Ellis
6d25ee1f68 Add OSX.10.12 RID to some test assets 2017-03-24 11:29:10 -07:00
Nick Guerrera
5e26d0f160 Package bundled version props in to a VS insertion nupkg 2017-03-24 11:11:31 -07:00
Livar
4ff4207705 Merge pull request #6137 from ellismg/use-osx-10-12-in-ci
Move CI to OSX 10.12
2017-03-24 09:43:44 -07:00
dasMulli
a4cb3fdf81
Allow directories as project arguments to run command. 2017-03-24 06:44:53 +01:00
Matt Ellis
608c7beeec Move CI to OSX 10.12
The shared framework now depends on OSX 10.12 or later. Move our jobs
forward so we can update the shared framework.
2017-03-23 22:16:47 -07:00
Matt Ellis
aeed60ded1 Update OSX CoreCLR RID
Since Microsoft.NETCore.App 2.0 will only support 10.12 and later, the
RID in the runtime package has changed to osx.10.12. We need to update
so we pick up crossgen from the right place.
2017-03-23 17:18:04 -07:00
jonsequitur
abfb877c5d update Microsoft.DotNet.Cli.CommandLineParser version for more selective option splitting 2017-03-23 17:12:35 -07:00
dotnet-bot
438d9de6ce Update CoreSetup to beta-001834 2017-03-23 23:58:21 +00:00
Nick Guerrera
7f010d38dd Merge pull request #6102 from nguerrera/version-props
Generate auto-imported props file with bundled netcoreapp and netstandard versions
2017-03-23 16:49:55 -07:00
Matt Ellis
8b7d1c6e2a Target update-dependencies to netstandard2.0
Previously, this was 1.0 app. Since stage0 no longer contains a 1.0.X
shared framework, it would not run.

Move to 2.0.0 (instead of 1.1.X since the 1.1.X shared framework will
stop being in stage0 soon as well).
2017-03-23 15:04:32 -07:00