mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6871 commits 41 branches 190 tags 95 MiB
Commit graph

1058 commits

Author SHA1 Message Date
Livar
9c85fc7fed Merge pull request #6436 from nguerrera/sdk-resolver 
Add msbuild sdk resolver
 2017-04-28 15:54:07 -07:00
Livar Cunha
cc9819ed93 Removing the code to generate the lzma archive and instead download it from the asp.net location. 2017-04-28 15:45:29 -07:00
John Beisner
53d900b19e Fixing the 'linux' ASP .Net Core Runtime archive download; and revving the version. 2017-04-28 14:23:25 -07:00
John Beisner
de46bf31d8 Add ASP .Net Core Runtime to the CombinedFrameworkSdk archive. 2017-04-28 12:25:46 -07:00
John Beisner
68487f775b Change in ASP .Net Core Runtime blob storage ZIP file naming convention. 2017-04-28 10:21:35 -07:00
John Beisner
1df11c3918 Moving to new version for ASP .Net Core Runtime; accounting for the split of the Windows ZIP ASP .Net Core Runtime for x64/x86; trivial formating 2017-04-28 09:57:29 -07:00
Livar Cunha
50c7b1e9b6 Copying the aspnet runtime store artifacts to stage2. 2017-04-28 00:10:19 -07:00
Mike Lorbetske
17c160e4c2 Update template package version 2017-04-27 23:23:04 -07:00
Mike Lorbetske
e5f6a150a8 Ingest updated template packages 2017-04-27 23:23:04 -07:00
Nick Guerrera
fa4fe3b2c6 Package MSBuild SDK resolver in VS insertion nupkg 2017-04-27 23:07:19 -07:00
Nick Guerrera
d26b41a0c3 Add msbuild sdk resolver 2017-04-27 23:07:18 -07:00
Livar Cunha
7dadb150af Updating the URL for the aspnet runtime store artifacts. Fixing a typo on ExtractDestination and condition extraction on file extension rather than OS. 2017-04-27 22:36:47 -07:00
John Beisner
b43acf4752 Updated ASP .NET Core Runtime blob storage configuration. 2017-04-27 22:36:41 -07:00
John Beisner
27b77da7a1 ASP .NET Core Runtime in the CLI; work in progress 2017-04-27 22:36:33 -07:00
Mike Lorbetske
effe64f0dd Update ASP.NET packages to version 24686 2017-04-27 22:32:28 -07:00
Livar
38b3e21c99 Merge pull request #6442 from dotnet-bot/release/2.0.0-UpdateDependencies 
Update CoreSetup to preview1-002101 (release/2.0.0)
 2017-04-27 20:14:50 -07:00
Eric Erhardt
5a81be48d0 Update NET.Sdk to 20170428-1 2017-04-27 20:13:46 -05:00
dotnet-bot
6a03ff2255 Update CoreSetup to preview1-002101 2017-04-28 00:46:59 +00:00
Livar
2cc5612fec Merge pull request #6287 from dotnet/dev-ragrawal-updatenuget2484 
update nuget version to 4.3.0-preview1-2500
 2017-04-27 12:59:19 -07:00
Daniel Plaisted
0c210b6e49 Update to SDK version with support for tools deps file generation 2017-04-27 09:31:07 -07:00
Daniel Plaisted
01d3895b24 Add tests for behavior of tools that target previous major version of shared framework 2017-04-27 09:30:39 -07:00
dotnet-bot
42ad257436 Update CoreSetup to preview1-002091 2017-04-27 01:34:35 +00:00
Livar
b4214c8b18 Merge branch 'master' into dev-ragrawal-updatenuget2484 2017-04-26 16:35:18 -07:00
dotnet-bot
221e32d28c Update CoreSetup to preview2-002093 2017-04-26 23:24:46 +00:00
Livar Cunha
d227fff356 Updating SDK to 1.0.0-alpha-20170426-3. 2017-04-26 15:24:22 -07:00
Livar Cunha
2e164f8f0a Merge branch 'release/2.0.0' into merge_release_200_again 
* release/2.0.0:
  Adding a work around for a test failure.
  Generating the Microsoft.NETCoreSdk.BundledVersions.props file in the CLI folder, so that it can be picked up by the SDK.
 2017-04-26 14:09:45 -07:00
Livar Cunha
51ce43cf5d Reverting some files that we don't want integrated back to master. 2017-04-26 11:45:26 -07:00
Livar Cunha
e6354edb81 Merge branch 'release/2.0.0' into merge_release_200 
* release/2.0.0:
  Temporarily remove tools
  Update to latest ASP.NET package versions & fix feed entry in NuGet.config
  Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced.
  Update core-setup channel to release/2.0.0
  Update CoreSetup to preview1-002088
  Update templates and add 'baseline' feature
  Remove accidental debug line
  Localization for CommonOptions
  Merge pull request #6380 from livarcocc/update_channel
  Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
 2017-04-26 10:59:47 -07:00
Livar
6c8fa9dddd Merge branch 'master' into dev-ragrawal-updatenuget2484 2017-04-26 10:38:02 -07:00
Livar
8207b865f4 Merge branch 'release/2.0.0' into move_bundled_versions 2017-04-26 10:30:34 -07:00
Livar Cunha
339bfe0168 Adding a work around for a test failure. 2017-04-26 10:30:04 -07:00
Eric Erhardt
bb1c3df558 Merge remote-tracking branch 'upstream/release/2.0.0' into release/2.0.0-UpdateDependencies 2017-04-26 11:45:24 -05:00
Mike Lorbetske
80c23d53d3 Temporarily remove tools 2017-04-25 21:52:43 -07:00
Mike Lorbetske
dde0cee897 Update to latest ASP.NET package versions & fix feed entry in NuGet.config 2017-04-25 21:31:12 -07:00
Eric Erhardt
126c42050d Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced. 2017-04-25 23:00:20 -05:00
Livar Cunha
8e7cd5c550 Add a hostfxr container version, because even a 1.1.2 hostfxr is being binplaced in a 1.1.0 container. 2017-04-25 20:40:19 -07:00
Eric Erhardt
de139a3bf8 Update core-setup channel to release/2.0.0 2017-04-25 22:29:50 -05:00
dotnet-bot
fd112f45a0 Update CoreSetup to preview1-002088 2017-04-26 03:16:03 +00:00
Zhi Li
ab0a68d32f update nuget version to 4.3.0-preview1-2500 2017-04-25 16:48:12 -07:00
Mike Lorbetske
9014b1b163 Update templates and add 'baseline' feature 2017-04-25 16:25:27 -07:00
Livar Cunha
9ec01bdce0 Making the code consistent in Prepare.targets. 2017-04-25 15:25:05 -07:00
Livar Cunha
5be74db440 Conditioning the version of hostfxr on the OS, because for Windows it actually has a different version. 2017-04-25 15:10:39 -07:00
Livar Cunha
7ebd363ca2 Generating the Microsoft.NETCoreSdk.BundledVersions.props file in the CLI folder, so that it can be picked up by the SDK. 2017-04-25 13:10:15 -07:00
dotnet-bot
195d11ceb5 Update CoreSetup to preview2-002081 2017-04-25 19:30:57 +00:00
Livar Cunha
de7c94592d Updating the runtime framework versions for 1.0.5 and 1.1.1 and updating the CLI branding to 1.0.4. 2017-04-24 18:11:59 -07:00
Chris Rummel
3efaab9fbc
Add SAS tokens to core-setup download. 2017-04-24 17:08:54 -05:00
Livar Cunha
ee8f8c9bc9 Porting over a change from master that allows to overwrite the CoreSetupBlobRootUrl. 2017-04-24 12:12:47 -07:00
Eric Erhardt
65662ea385 Merge branch 'master' into master-UpdateDependencies 2017-04-24 10:19:27 -05:00
Livar
63832070dd Merge pull request #6388 from livarcocc/bring_over_template_changes 
Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
 2017-04-22 13:18:16 -07:00
Livar
6464e0152d Merge pull request #6380 from livarcocc/update_channel 
Updating the release/2.0.0 channel and the README to point to this new channel
 2017-04-22 12:03:22 -07:00
Livar Cunha
d78823c019 Revert "Merge pull request #6380 from livarcocc/update_channel" 
This reverts commit 14cede7909, reversing
changes made to 8f2fcef544.
 2017-04-22 12:01:57 -07:00
Livar
4f6fbc4a7f Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates 
Update templates and engine, pin ASP.NET package versions, add web item templates
 2017-04-22 12:00:08 -07:00
Livar
4992296d12 Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates 
Update templates and engine, pin ASP.NET package versions, add web item templates
 2017-04-22 11:52:54 -07:00
Livar
14cede7909 Merge pull request #6380 from livarcocc/update_channel 
Updating the release/2.0.0 channel and the README to point to this new channel
 2017-04-22 11:52:13 -07:00
Mike Lorbetske
8227a6edac Update templates, remove browserlink from checked packages 2017-04-21 22:10:57 -07:00
Mike Lorbetske
38e467e990 Fix build warning for web projects, add gracefull fallback for framework reference add attempts 2017-04-21 20:51:52 -07:00
Mike Lorbetske
2cbbea5b48 Put 195 engine version back 2017-04-21 20:51:52 -07:00
Mike Lorbetske
90cdb07cbc Try slightly earlier engine version 2017-04-21 20:51:52 -07:00
Mike Lorbetske
4dd1be1978 Respond to review feedback 2017-04-21 20:51:52 -07:00
Mike Lorbetske
9ea9cbc8a6 Update templates and engine, pin ASP.NET package versions, add web item templates 2017-04-21 20:51:52 -07:00
Eric Erhardt
88b99847e0 Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced. 2017-04-21 21:54:35 -05:00
dotnet-bot
31dbdfa197 Update CoreSetup to preview2-002066 2017-04-22 02:06:37 +00:00
Livar Cunha
41a2e46ca0 Updating the release/2.0.0 channel and the README to point to this new channel. 2017-04-21 16:11:14 -07:00
Livar Cunha
6df9bc3055 Moving master branch to preview2 branding. 2017-04-21 14:26:45 -07:00
Eric Erhardt
12eff39992 Update Core-setup to 2.0.0-preview1-002061-00 2017-04-21 12:47:56 -05:00
Livar
63efcc5a0f Merge pull request #6366 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-002057 (master)
 2017-04-21 09:54:18 -07:00
dotnet-bot
bb60a32737 Update CoreSetup to preview1-002057 2017-04-21 00:13:14 +00:00
Livar Cunha
31eeaa4744 Enable HighEntropyVA in our builds by default. 2017-04-20 14:01:34 -07:00
Livar Cunha
61a934229e Updating SDK version to 2.0.0-alpha-20170420-1 2017-04-19 17:12:07 -07:00
Livar
12dbed613a Merge pull request #6319 from smadala/tp-insert-0414 
TestPlatform 15.1.0-preview-20170414-04 insertion
 2017-04-19 10:08:46 -07:00
Eric Erhardt
33b83ee1c7 Merge pull request #6343 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-002028 (master)
 2017-04-19 09:15:26 -05:00
Rama krishnan Raghupathy
a150055dfb Merge pull request #6342 from ramarag/updateDependency 
Updating Microsoft.Extensions.DependencyModel to 002022
 2017-04-18 22:16:14 -07:00
Livar
3f82e11a91 Merge branch 'master' into tp-insert-0414 2017-04-18 21:06:17 -07:00
Livar
3269475562 Merge pull request #6341 from dotnet/websdkversionupdate0417 
Updating the websdk version to 1.0.0-rel-20170413-451
 2017-04-18 21:05:31 -07:00
dotnet-bot
64b976a348 Update CoreSetup to preview1-002028 2017-04-17 21:36:31 +00:00
Rama Krishnan Raghupathy
a629dfe210 Updating Microsoft.Extensions.DependencyModel to 002022 2017-04-17 13:02:56 -07:00
Livar
78868ad33a Merge pull request #6320 from johnbeisner/CLI-backcompat-tests 
Adding a CLI Test: Execute a 1.0 tool in a netcoreapp1.1 project
 2017-04-17 10:05:40 -07:00
Vijay Ramakrishnan
e9f2b22492 Updating the websdk version to 1.0.0-rel-20170413-451 2017-04-17 10:00:42 -07:00
dotnet-bot
65ebbded91 Update CoreSetup to preview1-002021 2017-04-17 15:09:44 +00:00
Rama Krishnan Raghupathy
bb4298ddc2 Updating SDk to 20170414 2017-04-14 14:55:01 -07:00
John Beisner
f56306cc62 Adding a CLI Test: Execute a 1.0 tool in a netcoreapp1.1 project 
https://github.com/dotnet/cli/issues/6229
 2017-04-14 09:40:46 -07:00
Satya Madala
59de556b76 TestPlatform 15.1.0-preview-20170414-04 2017-04-14 20:52:52 +05:30
Daniel Plaisted
2b4992c56d Merge pull request #6304 from dotnet/update-sdk 
Update SDK to 2.0.0-alpha-20170411-3
 2017-04-13 17:49:34 -07:00
Daniel Plaisted
1bd0873b42 Update SDK to 2.0.0-alpha-20170413-1 2017-04-13 14:36:14 -07:00
dotnet-bot
9e1ce3a5ab Update CoreSetup to preview1-001978 2017-04-12 22:50:27 +00:00
Rama krishnan Raghupathy
8bd15c7ec0 Merge pull request #6300 from ramarag/dependencymodel 
moving dependecymodel and platformabstraction to preview1-001960
 2017-04-11 18:54:43 -07:00
Rama Krishnan Raghupathy
2f5673f953 moving dependecymodel and platformabstraction to preview1-001960 2017-04-11 17:00:50 -07:00
Davis Goodin
b654c55985 Skip versions repo publish if auth not defined 2017-04-11 15:41:31 -05:00
dotnet-bot
60f830aa7f Update CoreSetup to preview1-001961 2017-04-11 18:03:18 +00:00
William Li
a6d3012da1 Replace dotnet help parser with CliCommandLineParser 
CliCommandLineParserVersion 138 cannot use help as command and --help as
opinion at the same timem, update to 142
 2017-04-10 22:11:14 -07:00
Livar
5e9e688d9e Merge pull request #6289 from mlorbetske/dev/mlorbe/UpdateWeb20TemplatesAndEngineVersion 
Update templates & engine, rename --skip-restore to --no-restore
 2017-04-10 20:54:23 -07:00
Mike Lorbetske
fc77d7e152 Update templates & engine, rename --skip-restore to --no-restore 2017-04-10 20:00:17 -07:00
dotnet-bot
607a001553 Update CoreSetup to preview1-001960 2017-04-11 01:54:27 +00:00
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
Rohit Agrawal (NUGET)
21c501dfc0 update nuget version to 4.3.0-preview1-2484 2017-04-10 16:48:32 -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
Livar
158eea3127 Updating the patch version of the CLI to 1.0.3 2017-04-06 16:30:49 -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
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
dotnet-bot
438d9de6ce Update CoreSetup to beta-001834 2017-03-23 23:58:21 +00:00
Nick Guerrera
e644058c0e Merge branch 'master' into version-props 2017-03-23 13:59:47 -07:00
Justin Emgarten
e1cb32a1f2 Updating CLI_NETSDK_Version and CLI_NuGet_Version 2017-03-22 19:51:00 -07:00
Nick Guerrera
a5051a0aff Generate bundled version props 2017-03-22 15:28:39 -07:00
Nick Guerrera
4abb4d97a9 Update dotnet/sdk version 2017-03-21 21:30:27 -07:00
jonsequitur
4effd9354c merge 2017-03-21 11:57:08 -07:00
Rama krishnan Raghupathy
2fb9033970 Merge pull request #6085 from ramarag/apphost 
Using Apphost.exe for standalone apps
 2017-03-20 19:21:04 -07:00
Rama Krishnan Raghupathy
a48f3a6bbf Using Apphost.exe for standalone apps 2017-03-20 18:06:48 -07:00
Livar Cunha
ff294c312a Fixing the moniker for the new rids. 2017-03-20 14:37:29 -07:00
Livar Cunha
df496d0959 Fixing the extra distros. 2017-03-20 12:41:47 -07:00
Livar
ae6c0d17dc Merge pull request #5990 from livarcocc/enable_more_distros 
Enable more distros
 2017-03-20 09:36:24 -07:00
jonsequitur
c85492bd48 merge master 2017-03-19 17:09:05 -07:00
Livar Cunha
bb178a5133 Updated tests to the new appropriate TFM 1.1, since we need a shared runtime besides 2.0 in the new distros. Once we have vstest for 2.0 then we won't need it anymore. 2017-03-17 20:32:51 -07:00
Livar Cunha
cfd0874c96 Modified test assets and added the new rids back as badges and CI. Still need to update tests. 2017-03-17 20:32:50 -07:00
dotnet-bot
1a767d4238 Update CoreSetup to beta-001791 2017-03-17 20:56:42 +00:00
dotnet-bot
7cdef98e18 Update CoreSetup to beta-001783 2017-03-17 01:32:18 +00:00
Livar
5476ad9cf8 Merge pull request #6053 from smadala/tp-redist-02 
Netcoreapp2.0 targetted TestPlatform
 2017-03-16 14:56:23 -07:00
Satya Madala
d42602e377 add Testplatform netcore2.0 targetted and vstest myget feed 2017-03-16 23:19:12 +05:30
dotnet-bot
ff27937d73 Update CoreSetup to beta-001776 2017-03-16 00:55:37 +00:00
dotnet-bot
8236618e42 Update CoreSetup to beta-001763 2017-03-15 00:28:21 +00:00
Livar Cunha
7299ec1f0a Updating the CLI branding to 1.0.2 and updating the msbuild version. 2017-03-14 17:14:53 -07:00
dotnet-bot
3fd60e911f Update CoreSetup to beta-001747 2017-03-14 04:59:57 +00:00
dotnet-bot
5ac4287d5c Update CoreSetup to beta-001745 2017-03-13 18:04:55 +00:00
jonsequitur
ae01694167 Merge branch 'tab-completion' of https://github.com/jonsequitur/cli into tab-completion 2017-03-11 09:45:19 -08:00
Jon Sequeira
6e3a55e872 update CliCommandLine version 2017-03-10 18:21:58 -08:00
Piotr Puszkiewicz
23d4fb32f3 Merge remote-tracking branch 'jonsequitur/tab-completion' into tab-completion 2017-03-10 17:37:26 -08:00
Jon Sequeira
34d9cbf863 new CliCommandLine version 2017-03-10 17:11:19 -08:00
Piotr Puszkiewicz
df3c08b645 Pass through test options to msbuild 2017-03-10 13:49:49 -08:00
dotnet-bot
4a57564f08 Update CoreSetup to beta-001737 2017-03-10 20:44:00 +00:00
Piotr Puszkiewicz
0df2462344 Merge remote-tracking branch 'dotnet/master' into tab-completion 2017-03-10 12:03:01 -08:00
dotnet-bot
5430d155cc Update CoreSetup to beta-001728 2017-03-10 16:37:40 +00:00
jonsequitur
58bf70a476 merge 2017-03-09 18:36:05 -08:00
Eric Erhardt
43263cc9c3 Add logging for publishing src\redist.csproj 2017-03-09 16:30:29 -06:00
dotnet-bot
86f539e420 Update CoreSetup to beta-001711 2017-03-09 19:21:49 +00:00
Eric Erhardt
81c2d4605e Merge pull request #5957 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to beta-001697 (master)
 2017-03-08 22:05:32 -06:00
Justin Goshi
113924eebd Add support to build linux portable (#5938) 
* Add support to build with the linux portable

* Pass targets to run for the linux portable

* Address PR comments

* Update the bootstrapper version

* Address the PR comments for improving the help text

* Fixing permissions
 2017-03-08 13:37:06 -10:00
dotnet-bot
e246be9f64 Update CoreSetup to beta-001697 2017-03-08 20:31:52 +00:00
Justin Goshi
45a1e9e56c Allow host info passed in from the command line to override machine settings (#5904) 
* Allow host info passed in from the command line to override machine settings

* Simplify the logic

* Address PR comments to keep a separate HostRid and HostOSName that are static

* Rename to BuildInfo.props

* Address PR comments

* Fix the previous merge

* Fix spacing

* Address PR comments
 2017-03-08 09:10:53 -10:00
Livar
22816d7958 Merge pull request #5945 from piotrpMSFT/piotrpMSFT/infra/00prefix 
Fix RHEL builds
 2017-03-08 08:36:11 -08:00
dotnet-bot
dba212b21b Update CoreSetup to beta-001689 2017-03-08 15:53:17 +00:00
Livar
8df1812e7b Merge pull request #5946 from dotnet/update-sdk 
Update .NET SDK
 2017-03-07 20:42:18 -08:00
Eric Erhardt
f4090e2438 Merge pull request #5939 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to beta-001683 (master)
 2017-03-07 18:55:10 -06:00
Daniel Plaisted
b0891781cb Update .NET SDK 2017-03-07 13:38:00 -08:00
Unknown
bd97d02937 Fix RHEL issue 2017-03-07 13:22:42 -08:00
Unknown
d313cb4012 Change suffix to preview1 2017-03-07 12:05:42 -08:00
Unknown
eaa5049859 Force string comparison 2017-03-07 12:02:47 -08:00
dotnet-bot
0f4c77dbbd Update CoreSetup to beta-001683 2017-03-07 19:48:43 +00:00
Jon Sequeira
1ed5b420a9 don't split on : or = in restore command parse 2017-03-07 11:28:35 -08:00
Unknown
97e3767bd7 use PadLeft 2017-03-07 11:04:18 -08:00
Unknown
06ab197be5 Add back 000000 padding to commit count 2017-03-07 10:49:28 -08:00
Livar Cunha
ab28591c10 Replacing hard coded references to shared framework version. 2017-03-06 21:25:42 -08:00
dotnet-bot
44b6bbdba3 Update CoreSetup to beta-001675 2017-03-06 16:52:17 +00:00
Livar
b42697ff09 Merge pull request #5917 from eerhardt/FixVersionsRepoUpdater 
Fix UpdateVersionsRepo to always write the files correctly.
 2017-03-03 20:31:05 -08:00
Eric Erhardt
21471aa956 Fix UpdateVersionsRepo to always write the files correctly. 
We were only building nupkgs on windows, which meant if a non-windows machine was the last leg to finish, we were writing a blank file to the versions repo.

Fix #4399
 2017-03-03 21:43:38 -06:00
dotnet-bot
74defebb5a Update CoreSetup to beta-001663 2017-03-04 03:34:35 +00:00
Eric Erhardt
0e0b59f910 Merge pull request #5909 from dotnet/UpdateSDK 
Update NET.Sdk to 1.1.0-alpha-20170303-2
 2017-03-03 19:56:16 -06:00
Rama Krishnan Raghupathy
94dab4559a Merge remote-tracking branch 'upstream/master' into UpdateSDK 2017-03-03 14:27:05 -08:00
Livar
70c65160f6 Merge pull request #5892 from livarcocc/merge_rel101_into_master 
Merge rel101 into master
 2017-03-03 14:11:06 -08:00
Parallels
a5c7ac12f7 Fixing a couple more merge issues regarding deb generation. 2017-03-03 13:30:57 -08:00
Daniel Plaisted
4b9c4efc3f Update versions of MSBuild and NuGet 2017-03-03 12:33:56 -08:00
Parallels
f42599dec2 Fixing ubuntu deb generation. 2017-03-03 11:13:41 -08:00
Eric Erhardt
7fca740af5 Update NET.Sdk to 1.1.0-alpha-20170303-2 2017-03-03 10:11:30 -06:00
Livar Cunha
c667ec7702 Fixing a bad merge on Installer.DEB.proj. 2017-03-03 01:08:58 -08:00
Piotr Puszkiewicz
a07ebe2e7b Merge remote-tracking branch 'refs/remotes/dotnet/master' 
Conflicts:
	TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
	TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
	TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
	TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
	TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
	TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
	TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
	build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs
 2017-03-02 23:49:01 -08:00
Piotr Puszkiewicz
5048f65703 Merged branch master into piotrpMSFT/infra/CodeCleanup 2017-03-02 21:56:50 -08:00
Livar Cunha
103833fd34 Updating the version of the TestFramework which fixed the tests for dotnet test and vstest and actually managed to move the projects used there to 2.0. So, only test packages should remain 1.0. 2017-03-02 21:43:06 -08:00
Piotr Puszkiewicz
a5862752c9 Version as Metadata in build/ 2017-03-02 19:50:46 -08:00
Piotr Puszkiewicz
fbb75e1a47 Remove task usage in commitcount calculation 2017-03-02 18:46:08 -08:00
Livar Cunha
23e39c10b7 Moving as many of our test assets to netcoreapp2.0 as possible. I believe the only ones missing at the test packages, because tools always target 1.0. And the other ones are VSTestDotNetCore and VSTestXUnitDotNetCore, because we can't run tests on 2.0 yet. Or, when I tried it failed. I may came back to try this out later. 2017-03-02 17:41:21 -08:00
Livar Cunha
792cc7bf2a Fixing a couple of wrong merges. 2017-03-01 22:34:08 -08:00
Livar Cunha
3a9525b5ac Merge branch 'rel/1.0.1' into merge_rel101_into_master 
* rel/1.0.1: (66 commits)
  Update LZMA license with correct text
  Bump to 2.0.0-rc5-61427-04
  Remove duplicate installer suffix
  Add license text to LZMA SDK license notice
  Updating the SDK to 1.0.0-alpha-20170224-6
  Updating both platform abstractions and dependency model to 1.0.3.
  Bump Roslyn to 2.0.0-rc5-61424-02
  Update Stage0 to use the latest build.
  Update README with new distros.
  Back porting #5597 into rel/1.0.0
  Fixing the exclude pattern used by the Migration to exclude WEB SDK globs.
  Remove RID from test package creation
  Disable migrate and publish web app with content because CI does not have NPM
  Adding an E2E test for pack with content during migration.
  Fixing a failing test and adding a few more E2E tests around binplace content for migrated projects.
  Fix debian_config.json on ubuntu16.10
  Updating publish, pack and build of content to use None with Never/false/Never in their metadata for excluded items.
  Intermediate commit to get a WIP PR out. This adds the None Update with CopyToOutputDirectory set to Never.
  Switching the CopyToOutput for build and publish and the file for pack to use None Update instead of include. Also, fixed the exclude patterns for web apps.
  Do not migrate Content that is already included in the Web SDK for web apps.
  ...
 2017-03-01 20:50:42 -08:00
Eric Erhardt
b64068291b Remove OpenSUSE13 and Fedora23 since they are end of lifed. 2017-03-01 15:27:50 -06:00
Livar Cunha
94b79f4466 Updating the badge names that we use when checking if the build changed. Before, we were using an API to generate the OS names, now we are using msbuild OSName property, which names the OS differently. 2017-03-01 11:46:53 -08:00
Piotr Puszkiewicz
12fde69e86 Move remaining Publish actions to redist.csproj 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
eee7c7ed32 Move PDB removal to redist.csproj target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
283a80dff0 Move Symbols package creation to redist target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
28d83da782 Remove vbc in a target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
db35770913 Add back Windows condition 2017-02-28 19:30:43 -08:00
Piotr Puszkiewicz
664f089985 Reduce chmod 2017-02-28 18:16:51 -08:00
Piotr Puszkiewicz
b2429da437 Merge pull request #5869 from dotnet/dev/jgoshi/fixBrokenPublish 
Fix broken publish for official builds
 2017-02-28 14:34:32 -08:00
Piotr Puszkiewicz
52af661ca2 Merge pull request #5866 from piotrpMSFT/piotrpMSFT/infra/crossgentarget 
Simplify crossgen script and move to dedicated target in redist.csproj
 2017-02-28 14:33:58 -08:00
Piotr Puszkiewicz
88ab21600d Remove RID from package creation 2017-02-28 12:00:05 -08:00
Justin Goshi
9ffa76eab4 Fix broken publish for official builds 2017-02-28 10:16:52 -08:00
Piotr Puszkiewicz
01ca1b1208 Ensure redist publishes Roslyn 
Also fix issue found in PR
 2017-02-28 01:39:45 -08:00
Piotr Puszkiewicz
9bdd38cc19 Initial 2017-02-28 01:17:22 -08:00
Eric Erhardt
37c6842e00 Update NET.Sdk to 1.1.0-alpha-20170228-1. 2017-02-27 23:24:02 -08:00
Eric Erhardt
c1da263d40 Update NuGet to 4.0.1-beta-2321. 
Update NET.Sdk to 1.1.0-alpha-20170227-1
 2017-02-27 23:23:37 -08:00
Eric Erhardt
93f8157a04 Update NET.Sdk to 1.1.0-alpha-20170217-4 2017-02-27 23:21:16 -08:00
Piotr Puszkiewicz
15f1582945 Move Test to use build output where possible. 2017-02-27 20:45:26 -08:00
Piotr Puszkiewicz
8ca21b67f9 Add relative paths, add logs by default 2017-02-27 17:19:39 -08:00
Piotr Puszkiewicz
5d193e8b39 Merge conflicts 2017-02-27 17:13:13 -08:00
Piotr Puszkiewicz
b1787426c0 Also move nupkg contentFiles 2017-02-27 17:11:37 -08:00
Piotr Puszkiewicz
43266d2d9a Move publishing static MSBuildExtensions to redist.csproj 2017-02-27 17:11:03 -08:00
Piotr Puszkiewicz
7ea5bf478e Merge pull request #5861 from dotnet/dev/jgoshi/removeDuplicateProps 
Remove duplicate properties
 2017-02-27 16:40:31 -08:00
Piotr Puszkiewicz
e92f9dfe0d Bump to 2.0.0-rc5-61427-04 2017-02-27 15:07:54 -08:00
Piotr Puszkiewicz
79704cc074 Merge branch 'rel/1.0.1' into piotrpMSFT/bump/Roslyn 2017-02-27 13:15:06 -08:00
Eric Erhardt
c66d3bb6ad Update NuGet version with latest netstandard2.0 build 2017-02-27 14:50:39 -06:00
Justin Goshi
61c1e3e104 Remove duplicate properties 2017-02-27 11:06:44 -08:00
Piotr Puszkiewicz
0a6deabcce Enable multi-proc build of test sln. 2017-02-27 10:34:59 -08:00
Piotr Puszkiewicz
b55b5ad033 Remove duplicate installer suffix 2017-02-27 10:21:42 -08:00
Eric Erhardt
ab887ec024 Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101 2017-02-25 14:30:53 -06:00
Eric Erhardt
23392fa3c3 Merge branch 'rel/1.0.0' into piotrpMSFT/bump/Roslyn 2017-02-25 13:12:35 -06:00
Livar Cunha
9210b84a98 Updating the SDK to 1.0.0-alpha-20170224-6 2017-02-24 15:56:59 -08:00
Livar Cunha
b3da712d3d Updating both platform abstractions and dependency model to 1.0.3. 2017-02-24 14:52:05 -08:00
Unknown
66be1db3fe Bump Roslyn to 2.0.0-rc5-61424-02 2017-02-24 14:11:35 -08:00
Justin Goshi
1b318510b2 Add back last empty line in BranchInfo.props 2017-02-24 10:36:07 -08:00
Justin Goshi
8279c16fa4 Merge branch 'master' into dev/jgoshi/removeGlobalProps 2017-02-24 10:34:23 -08:00
Justin Goshi
5bb7ca8112 Add back BranchInfo.props 2017-02-24 10:34:16 -08:00
Piotr Puszkiewicz
e2dcac0e4b Merge branch 'rel/1.0.1' into FixUbuntu1610 2017-02-24 01:22:49 -08:00
Unknown
3dc266f21c Remove RID from test package creation 2017-02-24 00:57:15 -08:00
Eric Erhardt
a7003763b7 Fix debian_config.json on ubuntu16.10 
When we only have a single shared framework, the python json parser throws an error since there is a hanging comma on the last property.

Fixing this by removing the comma when there is only a single Shared Framework dependency.
 2017-02-23 23:25:26 -06:00
Livar
16d1fe4c28 Merge branch 'rel/1.0.0' into update_sdk 2017-02-23 19:49:36 -08:00
Piotr Puszkiewicz
781326a0ad Merge branch 'rel/1.0.0' into tp-insert-15.0.0 2017-02-23 18:40:58 -08:00
Piotr Puszkiewicz
8fc6766785 Merge branch 'rel/1.0.1' into Merge100To101 2017-02-23 18:22:02 -08:00
Piotr Puszkiewicz
22fcc35797 Merge pull request #5820 from dotnet/dev/jgoshi/refactorPackage 
Refactor props in package directory
 2017-02-23 18:15:52 -08:00
Justin Goshi
74e343e111 First pass at cleaning up the global properties files 2017-02-23 17:07:26 -08:00
Mike Lorbetske
d9d5bb10cb Template update for test SDK version change 2017-02-23 14:13:27 -08:00
Matt Ellis
0f092f92c2 Don't look for Debian package dependencies when skipping installers 
Today, we always check to see if DebianPackageBuildDependencies are
present on the machine doing a build, because we will need them to
build the .deb files later on.

Since we now allow skipping of building packages, don't check for
these dependencies if we weren't going to use them.
 2017-02-23 14:11:11 -08:00
Justin Goshi
0ec5003d68 Forgot Installer.PKG.targets 2017-02-23 13:59:20 -08:00
Eric Erhardt
ace9526681 Merge remote-tracking branch 'refs/remotes/upstream/rel/1.0.0' 
Conflicts:
	README.md
	build/Microsoft.DotNet.Cli.Monikers.props
	test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
 2017-02-23 15:42:35 -06:00
Justin Goshi
d9e532a53d Fix the build break 2017-02-23 13:30:04 -08:00
Eric Erhardt
5227896d0f Fix Ubuntu16.10 BuildSdkDeb 
We need to replace a string with string.Empty in the debian .json file. Fixing ReplaceFileContents to support this scenario.
 2017-02-23 15:29:11 -06:00
Justin Goshi
43cf7be593 Try to fix the build break 2017-02-23 13:11:25 -08:00
Piotr Puszkiewicz
55b81e8a23 Merge pull request #5814 from piotrpMSFT/piotrpmsft/infra/removeCoreHost 
Remove corehost from CLI layout
 2017-02-23 12:40:21 -08:00
Justin Goshi
84e8b8580d Try the rename of the LayoutOutput directory 2017-02-23 12:28:57 -08:00
Justin Goshi
b86afddbd3 Try reverting Installer.DEB.targets to investigate the build break 2017-02-23 12:03:17 -08:00
Satya Madala
4c44e29ea0 TestPlatform branding changes: 15.0.0 2017-02-24 00:18:10 +05:30
Justin Goshi
2118c643d6 Refactor props in package directory 2017-02-23 10:37:48 -08:00
Piotr Puszkiewicz
9e4beca874 Merge pull request #5804 from dotnet/dev/jgoshi/refactorPublishTarget 
Refactor publish.target
 2017-02-23 10:13:47 -08:00
Justin Goshi
acc77e2a46 Address pr comments 2017-02-23 09:26:14 -08:00
Justin Goshi
08ffc78be6 Merge branch 'master' into dev/jgoshi/refactorPublishTarget 2017-02-23 09:01:44 -08:00
Piotr Puszkiewicz
56f9a84dfd Generate Version file before redist publish 2017-02-23 02:33:00 -08:00
Piotr Puszkiewicz
49dd6bcd7c Remove corehost from CLI layout 2017-02-23 01:36:43 -08:00
Livar Cunha
7f4f35db65 Adding the SDK version to the hash of the lzma archive, since the SDK has implicit package refs in it that will impact the archive when they change. 2017-02-23 01:13:58 -08:00
Piotr Puszkiewicz
7818348fc2 Move copying sharedfx to before publish of redist 2017-02-23 01:12:32 -08:00
Piotr Puszkiewicz
1199df1c05 Move tool deps file creation into redist.csproj 2017-02-22 22:47:11 -08:00
Piotr Puszkiewicz
dc1b97c4a1 Merge pull request #5806 from piotrpMSFT/piotrpMSFT/infra/HackFilesToCopy 
remove HackFilesToCopy
 2017-02-22 20:16:51 -08:00
Piotr Puszkiewicz
10750eb136 Merge pull request #5807 from piotrpMSFT/piotrpMSFT/infra/RoslynStaticPublish 
Enable Publishing Roslyn with Static Output Path
 2017-02-22 20:16:25 -08:00
Eric Erhardt
7036fa1aef Update dotnet-deb-tool-consumer to use the latest dotnet-deb-tool. 
The latest deb-tool will use the CLI's runtime, which is required on distros that don't have .NET Core 1.0 installed.
 2017-02-22 21:34:22 -06:00
Piotr Puszkiewicz
b9378b8a66 Merge pull request #5803 from dotnet/dev/jgoshi/refactorPublishDir 
Refactor props from publish directory
 2017-02-22 17:49:08 -08:00
Piotr Puszkiewicz
31f2410b4f Enable Publishing Roslyn with Static Output Path 2017-02-22 17:33:26 -08:00
Piotr Puszkiewicz
4d0dbdbb7f Cleanup 2017-02-22 17:05:49 -08:00
Piotr Puszkiewicz
1ed6c2cdac Fix spacing 2017-02-22 17:01:14 -08:00
Piotr Puszkiewicz
5a89b01459 Remove HackFilesToCopy 2017-02-22 16:57:32 -08:00
Piotr Puszkiewicz
84ead82037 RootProject property 2017-02-22 16:57:10 -08:00
Justin Goshi
8b2933839c Merge 2017-02-22 16:56:34 -08:00
Justin Goshi
e894d7e60e Refactor publish.target 2017-02-22 16:54:15 -08:00
Piotr Puszkiewicz
509cd0addb Merge branch 'rel/1.0.0' into tp-20170222-09 2017-02-22 16:47:08 -08:00
Piotr Puszkiewicz
4105138019 Merge branch 'rel/1.0.0' into tp-20170222-09 2017-02-22 16:33:51 -08:00
Justin Goshi
1f39e07909 Refactor props from publish directory 2017-02-22 16:19:56 -08:00
Unknown
1c9f2e9b83 ProjectsToPublish 2017-02-22 15:33:55 -08:00
Piotr Puszkiewicz
5be3a70121 RootProject property 2017-02-22 15:31:55 -08:00
Piotr Puszkiewicz
3c8477ad1b Merge branch 'rel/1.0.0' into piotrpMSFT/issues/brandingUpdate100 2017-02-22 15:23:15 -08:00
Mike Lorbetske
6a26c5584a Pick up a newer version of templates carrying the latest test SDK changes 2017-02-22 14:04:17 -08:00
Justin Goshi
13dbdd1a4e Merge 2017-02-22 13:38:39 -08:00
Piotr Puszkiewicz
a0a7512d7b Merge pull request #5782 from dotnet/dev/jgoshi/refactorCrossgenTarget 
Refactor props in crossgen.target
 2017-02-22 13:19:27 -08:00
Eric Erhardt
996d458e30 Support Ubuntu16.10 installer 
Since Ubuntu16.10 doesn't have a 1.0 shared framework, only install the 1.1 shared framework.
 2017-02-22 15:18:45 -06:00
Eric Erhardt
916a19c493 Add support for Fedora 24, OpenSUSE 42.1 and Ubuntu 16.10 2017-02-22 15:13:02 -06:00
Justin Goshi
4442b45fef Try to fix spacing part 3 2017-02-22 11:08:16 -08:00
Justin Goshi
c51d129294 Try to fix spacing part 2 2017-02-22 11:06:57 -08:00
Justin Goshi
aff69fb324 Try to fix spacing 2017-02-22 11:03:11 -08:00
Justin Goshi
7b62dd1267 Address some of the PR comments 2017-02-22 10:52:50 -08:00
Justin Goshi
1d9a2e5da1 Merge branch 'master' into dev/jgoshi/refactorLzmaTarget 2017-02-22 10:21:22 -08:00
Justin Goshi
02e47f1d00 Address PR comments 2017-02-22 10:10:54 -08:00
Justin Goshi
70b6dc3be6 Merge branch 'master' into dev/jgoshi/refactorCrossgenTarget 2017-02-22 10:08:54 -08:00
Justin Goshi
d828a08e60 Address PR comments 2017-02-22 09:25:06 -08:00
Justin Goshi
f7d77e3e54 Merge branch 'master' into dev/jgoshi/refactorTestTarget 2017-02-22 09:17:54 -08:00
Piotr Puszkiewicz
c5e7c3dd45 Merge pull request #5736 from dotnet/dev/jgoshi/morePropsRename 
Finish renaming props file to remove Microsoft.Dotnet.Cli prefix
 2017-02-22 09:15:20 -08:00
Arun Mahapatra
c4df7e5e2d Update TestPlatform to v15.0.0-preview-20170222-09. 2017-02-22 19:56:57 +05:30
Piotr Puszkiewicz
a1e9a5dfc4 PR feedback 2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
70b0a68038 Fix Stage2SdkDirectory 2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
a7fdc20f25 Convert redist.csproj outputdir to static property 
Also some cleanup to unnecessary stuff.
 2017-02-21 22:17:28 -08:00
Mike Lorbetske
36717ef3fc Fix lzma archive creation to include 1.0.x packages 2017-02-21 21:04:50 -08:00
Piotr Puszkiewicz
7a84c47d97 Update CLI branding 2017-02-21 16:40:12 -08:00
Mike Lorbetske
e145ca88e4 Placeholder for template update 2017-02-21 16:28:47 -08:00
Piotr Puszkiewicz
5ca773e67d Initial commit of 1.0.1 branch 2017-02-21 16:03:28 -08:00
Justin Goshi
d6dccfe75b Fix build breaks 2017-02-21 15:57:16 -08:00
Justin Goshi
2eb2c00b30 Refactor props in crossgen.target 2017-02-21 14:22:36 -08:00
Justin Goshi
b58a0210e2 Refactor properties from LzmaCompile.targets 2017-02-21 12:52:17 -08:00
Justin Goshi
f8148abec3 merge 2017-02-21 10:16:07 -08:00
Justin Goshi
27a11e4eca Merge branch 'master' into dev/jgoshi/morePropsRename 2017-02-21 10:00:30 -08:00
Livar Cunha
3ff78c64ff Fixing the build breaks by removing duplicate RemoteAssetsFromDepsJson and by fixing VersionSuffix in some needed test packages, because now they import dirs.props and dirs.props eventually brings in VersionSuffix. 2017-02-18 22:03:36 -08:00
Livar
aba1e18ff6 Merge branch 'rel/1.0.0' into tp-20170217 2017-02-17 21:34:26 -08:00
Piotr Puszkiewicz
0f919d7442 fix merge 2017-02-17 13:07:14 -08:00
Justin Goshi
4f209e61ea Refactor properties out of test.targets 2017-02-17 12:28:25 -08:00
Justin Goshi
30a43b3bda Merge 2017-02-17 09:53:00 -08:00
Livar
c779000010 Merge branch 'rel/1.0.0' into update_platform_abstractions 2017-02-17 09:02:54 -08:00
Satya Madala
44100209bc update TestPlatform version to 15.0.0-preview-20170217-05 2017-02-17 19:25:44 +05:30
Piotr Puszkiewicz
85b2a129db Merge branch 'rel/1.0.0' 
Conflicts:
	TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
	TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
	TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
	TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
	build.proj
	build/Compile.targets
	build/Microsoft.DotNet.Cli.Compile.targets
	build/Microsoft.DotNet.Cli.DependencyVersions.props
	build/Microsoft.DotNet.Cli.Monikers.props
	build/Microsoft.DotNet.Cli.Prepare.targets
	build/package/Microsoft.DotNet.Cli.Nupkg.targets
	build/package/Nupkg.targets
	build/test/TestPackageProjects.targets
	build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
	build_projects/dotnet-cli-build/GetCommitCount.cs
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
	src/dotnet-archive/dotnet-archive.csproj
	src/tool_msbuild/tool_msbuild.csproj
	src/tool_nuget/tool_nuget.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
	test/ArgumentsReflector/ArgumentsReflector.csproj
	test/EndToEnd/EndToEnd.csproj
	test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/crossgen.Tests/crossgen.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-build.Tests/dotnet-build.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj
	test/dotnet-pack.Tests/dotnet-pack.Tests.csproj
	test/dotnet-publish.Tests/dotnet-publish.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-run.Tests/dotnet-run.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj
	test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj
	test/dotnet-test.Tests/dotnet-test.Tests.csproj
	test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
	test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj
	tools/Archiver/Archiver.csproj
 2017-02-17 02:00:05 -08:00
Piotr Puszkiewicz
60b73e62a9 bump SDK to 20170217-2 2017-02-17 00:44:38 -08:00
Livar Cunha
1c409befbe Updating DependencyModel to 1.0.2 2017-02-17 00:29:17 -08:00
Justin Goshi
23a3879f46 Fix build break 2017-02-16 16:42:49 -08:00
Justin Goshi
5359ce47e9 Rename 2017-02-16 15:10:18 -08:00
Justin Goshi
e232e7d386 Revert the new file name 2017-02-16 15:09:42 -08:00
Justin Goshi
8acaadb625 Revert the rename 2017-02-16 15:09:08 -08:00
Justin Goshi
58d167f3e5 Refactor properties out of Compile.targets 2017-02-16 12:21:15 -08:00
Justin Goshi
8e58a247b0 Finish renaming props file to remove Microsoft.Dotnet.Cli prefix 2017-02-16 11:16:20 -08:00
Justin Goshi
c8fb586677 merge 2017-02-16 08:58:40 -08:00
Piotr Puszkiewicz
0e5633e527 Remove BundledRuntimes properties 2017-02-15 19:37:51 -08:00
Justin Goshi
e7de32e988 Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 17:02:42 -08:00
Matt Ellis
47b75cfa12 Misc build changes 
For injestion into a composed build, I'm adding some minor tweaks to
our build system:

 - Teach DownloadFile task how to consume file:// URLs so we can pass
   around artifacts using local sources.
 - Add `SkipBuildingInstallers`, an MSBuild property that can be set
   to true when installers (pkgs, msis, debs, rpms and the like) do
   not need to be built.
 - Add `IncludeAdditionalSharedFrameworks`, an MSBuild property that
   can be set to prevent additional shared frameworks (i.e. shared
   frameworks that the CLI does not use at runtime) from being
   downloaded and included in our payload.
 - Add `IncludeNuGetPackageArchive` an MSBuild property that can be
   set to prevent the lzma archive containing all the nupkgs we
   restore on first run from being included in the final output.
 - Provide a way to change the Uri use for blob storage (so the
   composed build and point at a local folder that looks like blob
   storage to pick up artifacts from).
 2017-02-15 16:52:46 -08:00
Justin Goshi
2664015e55 Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 16:01:37 -08:00
Livar
a1f4e81aec Merge branch 'rel/1.0.0' into piotrpMSFT/bump/15.1.548 2017-02-15 13:03:27 -08:00
Steve Desmond
bcad939b91 don't try to make crossgen executable if crossgen is disabled (it might not exist!) 2017-02-15 15:39:55 -05:00
Justin Goshi
4d38a9be97 Fix the file 2017-02-15 12:00:57 -08:00
Justin Goshi
74493a13e9 Delete the renamed file 2017-02-15 11:59:51 -08:00
Justin Goshi
b40635f8df Fix up the file 2017-02-15 11:59:30 -08:00
Justin Goshi
2f298ed616 Now add the original file without any rename 2017-02-15 11:57:11 -08:00
Justin Goshi
da81fcaa30 One more try. Delete the file first 2017-02-15 11:56:46 -08:00
Justin Goshi
832e8dc6e0 try new spacing 2017-02-15 11:54:35 -08:00
Livar Cunha
6c07b929bd The variable was missing dollar sign parenthesis in the target file. 2017-02-15 11:53:31 -08:00
Justin Goshi
0c7a94e7cb Trying to figure out spacing 2017-02-15 11:52:14 -08:00
Justin Goshi
ce0ae2553d fix tabs 2017-02-15 11:51:00 -08:00
Justin Goshi
688195b8b5 try again 2017-02-15 11:47:33 -08:00
Justin Goshi
e85f4069c4 Now rename 2017-02-15 11:43:27 -08:00
Justin Goshi
7a894df413 Trying to fix the diff of one file 2017-02-15 11:42:34 -08:00
Justin Goshi
72db23ed4d Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 10:28:47 -08:00
Piotr Puszkiewicz
627c03b070 Bump MSBuild to 15.1.548 2017-02-14 22:47:37 -08:00
Piotr Puszkiewicz
25e0020da5 Merge branch 'rel/1.0.0' into tp20170210-02 2017-02-14 16:51:59 -08:00
Nate Amundson
73d59c423d Remove import of dir.props from Signing.proj 
The build agents in our VSTS pool don't yet have MSBuild 15, so the
signing project can't import any MSBuild 15 projects. (The signing
project is built with the desktop MSBuild because MicroBuild depends on
it.)  Once the agents have MSBuild 15, this import can be added back.
 2017-02-14 16:49:57 -08:00
Justin Goshi
27182f293d merge 2017-02-14 16:43:23 -08:00
Piotr Puszkiewicz
a906069859 Merge pull request #5693 from dotnet/dev/jgoshi/refactorBuildProj 
Remove more properties from build.proj
 2017-02-14 16:19:53 -08:00
Piotr Puszkiewicz
6415c2334a Merge branch 'rel/1.0.0' into tp20170210-02 2017-02-14 15:47:24 -08:00
Justin Goshi
62abef428e Rename build files 2017-02-14 15:42:13 -08:00
Livar Cunha
8a53b08959 Running chmod after crossgen so that our chmod changes are not overwritten by it. 2017-02-14 13:13:08 -08:00
Justin Goshi
87ee130ab5 Create CoreSetupInfo.props 2017-02-14 10:30:28 -08:00
Rohit Agrawal
9cf8e8c57f update nuget to 4.0.0-rtm-2283 (#5691) 2017-02-13 18:11:51 -08:00
Justin Goshi
3b9ecf7f86 Address PR comments 2017-02-13 17:37:23 -08:00
Rama Krishnan Raghupathy
badab4680d Adding the shim of dotnet-cache 
Adds filter profile option to publish
 2017-02-13 16:01:06 -08:00
Justin Goshi
3dad3afc03 Remove more properties from build.proj 2017-02-13 15:08:10 -08:00
Livar
6ef4bdf4e2 Merge branch 'rel/1.0.0' into new_shared_framework_versions 2017-02-13 13:44:57 -08:00
Piotr Puszkiewicz
a101c703a1 First try at refactor of Prepare.targets (#5647) 
* First try at refactor of Prepare.targets

* Enable restore of CLI build tasks

* Fix up build

* Feedback

* Newlines

* Add new props to sln

* CommitCount

* NuGet.config

* WorkingDir

* packages dir path

* Add missing nuget.configs

* Workaround for https://github.com/NuGet/Home/issues/4583

* Match NuGet.Config casing

* Put back Version Badge Properties

* Remove duplicate
 2017-02-13 13:06:30 -08:00
Livar
251237b481 Merge branch 'rel/1.0.0' into drop_suffix 2017-02-11 11:52:10 -08:00
Livar Cunha
1d61bf97ed Updated the Shared Framework to 1.1.1 and 1.0.4. 2017-02-10 23:05:16 -08:00
Eric Erhardt
01d2505c03 Merge pull request #5662 from eerhardt/FixNetStandardLibrary 
Fix dotnet new classlib to contain the correct NETStandard.Library version.
 2017-02-10 20:26:11 -06:00
Livar Cunha
167e2da398 Updating msbuild to 15.1.0-preview-000545-01. 2017-02-10 16:13:15 -08:00
Justin Goshi
483e6bd9c1 Address PR comments 2017-02-10 14:13:44 -08:00
Justin Goshi
64ccab43e8 Merge branch 'master' into dev/jgoshi/refactorTasks 2017-02-10 13:38:07 -08:00
Eric Erhardt
25f9a1bbc7 Fix dotnet new classlib to contain the correct NETStandard.Library version. 
Fix #5638
 2017-02-10 14:22:07 -06:00
Justin Goshi
33d83d6639 Refactor tasks 2017-02-10 12:13:44 -08:00
Eric Erhardt
e7689a3116 Merge pull request #5648 from eerhardt/master-UpdateDependencies 
Upgrade update-dependencies
 2017-02-10 14:02:12 -06:00
Arun Mahapatra
4621c1a6ec Insert TestPlatform v15.0.0-preview-20170210-02. 2017-02-10 21:58:34 +05:30
Livar
1c896d4402 Adding release suffix as a modified parameter of the build and removing NugetVersionForVS. we don't need that concept. 2017-02-09 22:31:46 -08:00
Livar Cunha
81a94c0902 Enabling publishing the nupkgs produced by the CLI to blob storage and hooking up DropSuffix to the VS targeted nupkg of the CLI. 2017-02-09 15:47:53 -08:00
eerhardt
72af77de1b Update CoreSetup to beta-001509 2017-02-09 16:56:32 -06:00
Unknown
ee34309e4a Merge remote-tracking branch 'refs/remotes/dotnet/master' 
Conflicts:
	build/Microsoft.DotNet.Cli.Prepare.targets
 2017-02-09 11:00:02 -08:00
Piotr Puszkiewicz
806b294777 Overwrite props files if they exist 2017-02-09 10:50:21 -08:00
Eric Erhardt
454dd10f8d Update dotnet new to use the new 2.0 templates. 2017-02-09 10:18:39 -06:00
Piotr Puszkiewicz
6b7ad0544f small refactor 2017-02-09 00:26:40 -08:00
Livar
a88df7953c Merge branch 'rel/1.0.0' into drop_suffix 2017-02-08 20:35:49 -08:00
Justin Goshi
13fd6d85d7 Remove stuff from prepare.targets 2017-02-08 19:22:56 -08:00
Justin Goshi
2eac755db7 Refactor 2017-02-08 19:13:30 -08:00
Livar Cunha
d373ce8911 Enabling publish with drop suffix to still publish to a suffix based folder in blob to avoid conflicts. 2017-02-08 18:17:04 -08:00
Livar Cunha
35fc8c1d0e Step one of introducing a flag to drop the suffix out of our build versions. 2017-02-08 15:26:47 -08:00