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

6070 commits

This branch
This branch
All branches
Author SHA1 Message Date
Livar Cunha
4a5b64955f Reverting channel changes for stage0. In master we want to continue using the master channel. 2017-04-27 11:07:50 -07:00
Livar Cunha
55212f4777 Merge branch 'release/2.0.0' into merge_release_200 
* release/2.0.0:
  Updating the stage0 in release/2.0.0 to use a release/2.0.0 stage0 and turning off implicit package target fallback in the CLI.
  Update CoreSetup to preview1-002091
  Prime cache for Windows
 2017-04-27 11:06:13 -07:00
William Li
1eb2489e59 Use WixQuietExec to run command sliently 
Also add telemtery message to the installer
 2017-04-27 10:55:39 -07:00
Livar
57e31a0d13 Merge pull request #6441 from livarcocc/update_stage0 
Updating the stage0 and turn off implicit PTF
 2017-04-27 10:51:24 -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
811bb94de8 If generating deps.json fails, show MSBuild output in verbose output 2017-04-27 09:30:41 -07:00
Daniel Plaisted
d471037ce3 Show error if tools package doesn't include runtimeconfig file 
For test assets, don't explicitly include the runtimeconfig file, as the pack command does it automatically
 2017-04-27 09:30:41 -07:00
Daniel Plaisted
0afd0b9975 Remove dead code 2017-04-27 09:30:40 -07:00
Daniel Plaisted
4bf34512f8 Fix test asset which depends on SdkNuGetVersion property 2017-04-27 09:30:40 -07:00
Daniel Plaisted
cc9e942ede Apply code review feedback 2017-04-27 09:30:40 -07:00
Daniel Plaisted
06c1cc5990 Update test tools that need conflict resolution on 2.0 to target 2.0 2017-04-27 09:30:39 -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
Daniel Plaisted
8615c30063 Don't roll prefercliruntime tools forward across major versions of .NET Core 2017-04-27 09:30:38 -07:00
Daniel Plaisted
ea7d84fbca Remove unnecessary RuntimeFrameworkVersion and DotnetCliToolTargetFramework from test assets 2017-04-27 09:30:38 -07:00
Livar Cunha
a3baacaaf8 Updating the stage0 in release/2.0.0 to use a release/2.0.0 stage0 and turning off implicit package target fallback in the CLI. 2017-04-27 09:29:39 -07:00
Daniel Plaisted
5c679cd32e Test fixes for tools deps.json generation 2017-04-27 09:29:16 -07:00
Daniel Plaisted
fa51bb43fc Call into project in .NET SDK to create deps.json files for tools instead of doing so directly 2017-04-27 09:29:16 -07:00
Daniel Plaisted
c8a6b7b97a Add .binlog (MSBuild binary log format) extension to .gitignore 2017-04-27 09:29:15 -07:00
Eric Erhardt
f05868474a Merge branch 'release/2.0.0' into UpdateDepedencies2.0 2017-04-27 08:54:04 -05:00
Livar
51dc988fa2 Merge pull request #6432 from jonsequitur/remove-package-fixes 
fix NullReferenceError on remove package and incorrect help text
 2017-04-26 22:02:01 -07:00
Livar
3b3a89f1d8 Merge pull request #6434 from dotnet-bot/release/2.0.0-UpdateDependencies 
Update CoreSetup to preview1-002091 (release/2.0.0)
 2017-04-26 21:06:57 -07:00
Eric Erhardt
5c3a967e4f Merge pull request #6431 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview2-002093 (master)
 2017-04-26 22:29:05 -05:00
Eric Erhardt
039d20206f Merge branch 'release/2.0.0' into UpdateDepedencies2.0 2017-04-26 22:01:38 -05:00
dotnet-bot
42ad257436 Update CoreSetup to preview1-002091 2017-04-27 01:34:35 +00:00
Jon Sequeira
74af357f07 fix NullReferenceError on remove package and incorrect help text 2017-04-26 16:43:55 -07: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
f8ce7bca78 Merge pull request #6427 from livarcocc/merge_release_200_again 
Another merge release/2.0.0
 2017-04-26 16:10:27 -07:00
William Lee
e0c0075ccd Prime cache for Windows 
cmd.exe window will popup during the install. Will create an issue and fix it separately.
CLISDKMsiSourcePath needs to be install at the last step so the dotnet.exe will be there and all the files are there.
 2017-04-26 16:09:54 -07:00
Livar
c72ed9fcd2 Merge pull request #6423 from jonsequitur/tab-completion-doc 
Initial tab completion documentation
 2017-04-26 14:54:16 -07:00
William Li
a360596174 Prime cache for Windows 
cmd.exe window will popup during the install. Will create an issue and fix it separately.
CLISDKMsiSourcePath needs to be install at the last step so the dotnet.exe will be there and all the files are there.
 2017-04-26 14:44:23 -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
c9e0989152 Merge pull request #6422 from livarcocc/merge_release_200 
Merge release/2.0.0 back into master
 2017-04-26 13:23:42 -07:00
Livar
1b6041c725 Merge pull request #6409 from livarcocc/move_bundled_versions 
Generating the Microsoft.NETCoreSdk.BundledVersions.props file in a new location
 2017-04-26 12:22:35 -07:00
jonsequitur
c46b16ef43 tab completion documentation 2017-04-26 12:07:15 -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
Eric Erhardt
f4c4db4d3a update-dependencies hard-coded values 
Read MSBuild property values to get GITHUB_UPSTREAM_BRANCH and CORESETUP_VERSION_FRAGMENT instead of hard-coding them in update-dependencies.
 2017-04-26 13:28:27 -05:00
jonsequitur
0c5f9ff95b change script to assume dotnet is on the path 2017-04-26 11:25:29 -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
Livar
fb1b99c55a Merge pull request #6417 from dotnet-bot/release/2.0.0-UpdateDependencies 
Update CoreSetup to preview1-002088 (release/2.0.0)
 2017-04-26 10:27:28 -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
Livar
134dfae08e Merge pull request #6415 from mlorbetske/dev/mlorbe/UpdateTemplatesAndAddBaselinesFeature 
Update templates and add 'baseline' feature
 2017-04-25 23:59:59 -07: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
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