Commit graph

612 commits

Author SHA1 Message Date
Livar
0d57d7169f Merge pull request #6284 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-001957 (master)
2017-04-10 17:31:39 -07:00
Eric Erhardt
20207e1def Merge pull request #6283 from eerhardt/UpdateSDK
Update SDK to 2.0.0-alpha-20170410-1.
2017-04-10 18:40:03 -05:00
Eric Erhardt
07bd09a155 Append -portable to shared framework assets.
core-setup is producing "portable" assets with a "-portable" name.  We should be consuming those from the CLI build.
2017-04-10 18:25:22 -05:00
dotnet-bot
33503925db Update CoreSetup to preview1-001957 2017-04-10 22:16:24 +00:00
Vijay Ramakrishnan
9bb8f667a3 Changing the version to 441 2017-04-10 14:56:02 -07:00
Vijay Ramakrishnan
aae4218bfc Updating the websdk version 2017-04-10 13:49:24 -07:00
Eric Erhardt
ae78b87587 Update SDK to 2.0.0-alpha-20170410-1. 2017-04-10 14:24:52 -05:00
Livar Cunha
c8b042fd1b Fixing the build. 2017-04-08 00:31:27 -07:00
Livar Cunha
e286c65d25 Removing Additional Framework entirely and renaming LegacyRuntime to something more appropriate: BackwardsCompatibleRuntimes. Also, turning off some tests that I forgot to turn off for linux-x64. 2017-04-08 00:31:27 -07:00
Livar Cunha
772e838ff8 Removing the additional shared framework from the official stage2 build of the CLI. Instead, I also create a stage2 build with the legacy runtime so that we can continue to run tests tthat depend on it, but most importantly, we will be able to run backwards compatibility tests using it. 2017-04-08 00:31:27 -07:00
Livar
e1b4556641 Merge pull request #6254 from mlorbetske/dev/mlorbe/UpdateTemplatesAndEngine
Update template engine & template versions
2017-04-06 18:01:12 -07:00
Vijay Ramakrishnan
3aa7b10007 Updating the websdk version 2017-04-05 17:02:33 -07:00
Mike Lorbetske
379dd5c9e0 Update template engine & template versions 2017-04-05 13:50:12 -07:00
Livar
5ec3df813d Merge pull request #6242 from eerhardt/FixDisableCrossgen
Fix passing /p:DISABLE_CROSSGEN on cli.
2017-04-05 12:40:11 -07:00
Livar
82c2ad1f78 Merge pull request #6246 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-001915 (master)
2017-04-05 12:39:09 -07:00
Eric Erhardt
5b1adf9fd2 Update Sdk to 2.0.0-alpha-20170405-2 2017-04-05 12:50:36 -05:00
dotnet-bot
a2e1c06597 Update CoreSetup to preview1-001915 2017-04-05 00:32:55 +00:00
Eric Erhardt
a7becbe6d8 Fix passing /p:DISABLE_CROSSGEN on cli.
When passing a property using the commandline, it is not flown through to "dotnet publish" calls.  So instead of using "dotnet publish", just use the MSBuild task to invoke the Publish target on the reidst project.  This way properties flow correctly.

I also did a little cleaning of unused build logic.
2017-04-04 17:50:28 -05:00
dotnet-bot
2caa293a51 Update CoreSetup to preview1-001913 2017-04-04 18:04:37 +00:00
Eric Erhardt
b00384f497 Merge pull request #6234 from eerhardt/SelfContained
Add --self-contained to publish.
2017-04-04 12:03:09 -05:00
Livar
8e02c20a30 Merge pull request #6232 from dotnet/UpdateMSBuild
Update MSBuild to 15.2.0-preview-000093-02
2017-04-03 23:31:56 -07:00
Livar
34f7df0763 Merge pull request #6209 from livarcocc/first_run_fallback_folder
First run fallback folder
2017-04-03 23:23:29 -07:00
Livar
6187409418 Merge branch 'master' into UpdateMSBuild 2017-04-03 22:25:27 -07:00
Livar
b207165c67 Merge pull request #6231 from dotnet/websdkversion
Updating the websdk version
2017-04-03 22:24:27 -07:00
Livar Cunha
3d0089552c Fixing failures in tests when the user has a fallbackfolder setup on this machine already. These failures are again due to the fact that --packages are not populated when the packages are found in the fallback folder. 2017-04-03 22:15:40 -07:00
dotnet-bot
5e5d209115 Update CoreSetup to preview1-001907 2017-04-03 23:43:58 +00:00
Eric Erhardt
ab15200500 Add --self-contained to publish.
This flows to the $(SelfContained) property added in https://github.com/dotnet/sdk/pull/1053
2017-04-03 18:17:08 -05:00
Eric Erhardt
5e15b5f5c5 Update MSBuild to 15.2.0-preview-000093-02 2017-04-03 16:21:38 -05: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
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
Livar Cunha
a46237784e Modified the build script to generate the lzma archive without the nupkgs. Modified the configurer to upsert NuGet.Config with the fallback folder info and to extract the fallback folder. Added unit tests for all this. Next step: update E2E tests. 2017-03-30 00:11:17 -07: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
mlorbetske
d8e1943c49 Take newer version of the engine 2017-03-28 20:53:27 -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
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
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
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
7bfc51f2b1 Format BundledRuntimes.props to use consistent whitespace. 2017-03-24 14:22:34 -05: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
Nick Guerrera
5e26d0f160 Package bundled version props in to a VS insertion nupkg 2017-03-24 11:11:31 -07:00