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

6467 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Livar
4437eaf55e Merge pull request #6418 from livarcocc/hostfxr_container 
Add a hostfxr container version, because even a 1.1.2 hostfxr is bein…
 2017-04-25 20:48:57 -07: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
9593adffc7 Merge pull request #6405 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview2-002081 (master)
 2017-04-25 16:10:31 -07:00
Livar
1bd6b5e68d Merge pull request #6411 from livarcocc/hostfxr_vesion_for_windows 
Conditioning the version of hostfxr on the OS
 2017-04-25 15:25:38 -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
34c859d09c Merge pull request #6410 from crummel/fixVariableCase 
Fix case of variables we pass into docker.
 2017-04-25 14:01:59 -07:00
Chris Rummel
f66867a7f4
Fix case for variables we pass into docker. 2017-04-25 15:59:52 -05: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
Livar
4036ef197c Merge pull request #6407 from crummel/dockerRun-addNewVars 
Add new variables to dockerrun.sh so they're passed to the container.
 2017-04-25 12:37:24 -07:00
dotnet-bot
195d11ceb5 Update CoreSetup to preview2-002081 2017-04-25 19:30:57 +00:00
Chris Rummel
dcff438d5a
Add new variables to dockerrun.sh so they're passed to the container. 2017-04-25 13:39:08 -05:00
Livar
a35257e1e7 Merge pull request #6401 from livarcocc/update_runtime_versions 
[Won't pass CI] Updating the runtime framework versions for 1.0.5 and 1.1.1
 2017-04-25 10:15:30 -07: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
William Lee
6dd6192155 Merge pull request #6383 from wli3/small-bug-fixes 
Small bug fixes
 2017-04-24 16:40:46 -07:00
Livar
022cc5ebfb Merge pull request #6399 from crummel/coreSetupBlobUrl-addTokens 
Allow SAS tokens to be specified when download core-setup blobs.
 2017-04-24 16:23:13 -07:00
Chris Rummel
3efaab9fbc
Add SAS tokens to core-setup download. 2017-04-24 17:08:54 -05:00
Livar
59469fe833 Merge pull request #6396 from livarcocc/overwrite_CoreSetupBlobRootUrl 
Porting over a change from master that allows to overwrite the CoreSetupBlobRootUrl.
 2017-04-24 14:30:40 -07:00
Livar Cunha
ee8f8c9bc9 Porting over a change from master that allows to overwrite the CoreSetupBlobRootUrl. 2017-04-24 12:12:47 -07:00
Livar
79c308bb58 Merge branch 'release/2.0.0' into small-bug-fixes 2017-04-24 10:17:53 -07:00
Livar
dd4e8b79e0 Merge pull request #6382 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview2-002066 (master)
 2017-04-24 10:14:36 -07:00
Eric Erhardt
65662ea385 Merge branch 'master' into master-UpdateDependencies 2017-04-24 10:19:27 -05:00
William Li
de0c37a48c Remove accidental debug line 2017-04-23 14:13:19 -07:00
William Li
da398658dc Localization for CommonOptions 2017-04-23 14:13:11 -07: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
72cc5baeac Merge pull request #6387 from livarcocc/update_channel_release_200 
Merge pull request #6380 from livarcocc/update_channel
 2017-04-22 13:18:00 -07:00
Livar
0156fa5f60 Merge pull request #6386 from livarcocc/revert_channel_update 
Revert "Merge pull request #6380 from livarcocc/update_channel"
 2017-04-22 13:17:10 -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