Commit graph

7082 commits

Author SHA1 Message Date
Livar
cc0dbd3c22 Merge branch 'release/2.0.0' into dev/mlorbe/UpdateToCoherence26412 2017-07-21 11:58:03 -07:00
Livar
429cc2b0c1 Merge pull request #7208 from dotnet-bot/release/2.0.0-UpdateDependencies
Update CoreSetup to preview3-25510-01 (release/2.0.0)
2017-07-21 11:56:27 -07:00
Livar Cunha
a557206a0f Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170721-070025
* dotnet/release/2.0.0:
  Revert "Updating SDK to 2.0.0-preview3-20170721-1"
  Updating SDK to 2.0.0-preview3-20170721-1
  Update SdkBrandName
  Insert NuGet Build 4.3.0-rtm-4315 into cli
  Changing the 'coherent' badge value.
2017-07-21 11:29:52 -07:00
Livar Cunha
e07860c1df Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170721-070023
* dotnet/rel/1.1.0:
  MSBuild 15.3.409
  Update NuGet to 4.3.0-rtm-4315
  Update the SDK to 1.1.0-alpha-20170719-3
2017-07-21 11:25:20 -07:00
Livar
fc103d8134 Merge pull request #7210 from dotnet/livarcocc-patch-1
Update NuGet to 4.3.0-rtm-4315
2017-07-21 11:22:39 -07:00
Livar
f12a7b32fe Merge pull request #7216 from livarcocc/revert_sdk_update
Revert "Updating SDK to 2.0.0-preview3-20170721-1"
2017-07-21 11:21:09 -07:00
Livar
ff97ecffa5 Merge pull request #7214 from rainersigwald/msbuild-15.3.409-for-1.1
MSBuild 15.3.409
2017-07-21 10:37:04 -07:00
Livar Cunha
ab5130d7d9 Revert "Updating SDK to 2.0.0-preview3-20170721-1"
This reverts commit c45fca648c.
2017-07-21 10:17:32 -07:00
Rainer Sigwald
3a6c895aec MSBuild 15.3.409 2017-07-21 10:23:16 -05:00
Rainer Sigwald
e0ff36ba8e MSBuild 15.3.409 2017-07-21 10:22:52 -05:00
Mike Lorbetske
08d6a0618e Update to coherence 26412 2017-07-20 23:28:49 -07:00
Livar
126da7ab6a Update NuGet to 4.3.0-rtm-4315 2017-07-20 21:23:01 -07:00
Livar
24a6742dd1 Merge pull request #7207 from dotnet/nuget-insertbuild4315
Insert NuGet Build 4.3.0-rtm-4315 into cli
2017-07-20 21:21:28 -07:00
Livar
c45fca648c Updating SDK to 2.0.0-preview3-20170721-1 2017-07-20 17:49:45 -07:00
dotnet-bot
7108da7170 Update CoreSetup to preview3-25510-01 2017-07-21 00:26:04 +00:00
Livar
4fb43f49d6 Merge pull request #7206 from dotnet/livarcocc-patch-2
Update the SDK to 1.1.0-alpha-20170719-3
2017-07-20 14:32:16 -07:00
jbeisner
6f2b2c9757 Merge pull request #7205 from johnbeisner/BadgeFix
Github markdown rendering issue: README
2017-07-20 13:17:58 -07:00
William Li
d67e1f14db Update SdkBrandName 2017-07-20 12:59:19 -07:00
NuGet Team Bot
6da75e02a4 Insert NuGet Build 4.3.0-rtm-4315 into cli 2017-07-20 12:48:04 -07:00
Livar
fcf44afcc7 Update the SDK to 1.1.0-alpha-20170719-3 2017-07-20 11:55:36 -07:00
Livar
58c580dbcc Merge pull request #7201 from dotnet/merges/release/2.0.0-to-master-20170720-070024
Merge release/2.0.0 to master
2017-07-20 11:53:12 -07:00
John Beisner
68f1e6a9de Changing the 'coherent' badge value. 2017-07-20 11:32:03 -07:00
Livar
eae4b963e9 Merge pull request #7190 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170719-070021
Merge rel/1.1.0 to release/2.0.0
2017-07-19 15:35:22 -07:00
Nick Guerrera
141946c03e Merge pull request #7196 from nguerrera/progress-loc
Localize first-run "Expanding" and "Decompressing"
2017-07-19 15:34:00 -07:00
Nick Guerrera
28c51d2eaa Localize first-run "Expanding" and "Decompressing" 2017-07-19 13:58:06 -07:00
Nick Guerrera
86d9577606 Merge pull request #7021 from nguerrera/loc-override
Allow CLI UI language to be overridden by an environment variable
2017-07-19 13:28:12 -07:00
Livar
f009fa1b1d Merge pull request #7191 from dotnet/merges/release/2.0.0-to-master-20170719-070023
Merge release/2.0.0 to master
2017-07-19 13:14:14 -07:00
Livar
baef48e53b Merge pull request #7193 from mlorbetske/dev/mlorbe/UpdateToCoherence26380
Update to Coherence 26380
2017-07-19 12:16:26 -07:00
Livar Cunha
072999c68d Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170719-070021
* dotnet/rel/1.1.0:
  Update NuGet to 4.3.0-rtm-4294
2017-07-19 12:15:07 -07:00
Nick Guerrera
368531715e Fix VSLANG handling typo 2017-07-19 11:51:38 -07:00
Livar
d5365a3ce1 Merge pull request #7192 from dotnet/stevesa/update-spa-templates-to-1.0.0-preview-000409
Update SPA templates to 1.0.0-preview-000409
2017-07-19 11:30:25 -07:00
Nick Guerrera
85573db000 Respond to PR feedback: use method names not comments 2017-07-19 11:00:09 -07:00
Mike Lorbetske
8fe8095970 Update to Coherence 26380 2017-07-19 10:37:19 -07:00
Steve Sanderson
aed35f482d Update SPA templates to 1.0.0-preview-000409 2017-07-19 14:40:15 +01:00
Nick Guerrera
a1c423c0f6 Honor UI language override in test runs
Also fix some incorrect unlocalized test expectations that slipped in.
2017-07-18 22:03:31 -07:00
Nick Guerrera
60e2637143 Allow CLI UI language to be overridden by an environment variable 2017-07-18 21:20:52 -07:00
Livar
7b068c7118 Merge pull request #7183 from dotnet/merges/release/2.0.0-to-master-20170718-070024
Merge release/2.0.0 to master
2017-07-18 18:14:17 -07:00
Livar
c166a8086b Merge pull request #7182 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170718-070022
Merge rel/1.1.0 to release/2.0.0
2017-07-18 18:13:52 -07:00
Livar
c684137b88 Merge pull request #7188 from dotnet/livarcocc-patch-2
Update NuGet to 4.3.0-rtm-4294
2017-07-18 18:13:34 -07:00
Livar
ab9e858128 Merge pull request #7185 from dotnet-bot/release/2.0.0-UpdateDependencies
Update CoreSetup to preview3-25518-01 (release/2.0.0)
2017-07-18 16:30:44 -07:00
Livar
1728aef325 Merge branch 'master' into merges/release/2.0.0-to-master-20170718-070024 2017-07-18 15:58:34 -07:00
Livar Cunha
cf51d1d30a Merge remote-tracking branch 'dotnet/rel/1.1.0' into merges/rel/1.1.0-to-release/2.0.0-20170718-070022
* dotnet/rel/1.1.0:
  Use docker image for opensuse 13.2 from runtime
  MSBuild 15.3.407
  Updated NuGet to 4.3.0-preview4-4273
2017-07-18 15:54:04 -07:00
Livar
6e49d10bbc Update NuGet to 4.3.0-rtm-4294 2017-07-18 15:48:52 -07:00
William Li
79ff758a43 Use docker image for opensuse 13.2 from runtime 2017-07-18 14:25:45 -07:00
dotnet-bot
33b12c9fe4 Update CoreSetup to preview3-25518-01 2017-07-18 17:36:33 +00:00
Nick Guerrera
16d7104b36 Merge pull request #7180 from dotnet/nguerrera-update-sdk
Update dotnet/sdk to latest
2017-07-17 20:18:21 -07:00
Nick Guerrera
61b2990d62 Merge pull request #7175 from rainersigwald/msbuild-15.3.407-for-2.0
MSBuild 15.3.407
2017-07-17 19:45:17 -07:00
Nick Guerrera
41a6e8e8f4 Merge pull request #7176 from rainersigwald/msbuild-15.3.407-for-1.1
MSBuild 15.3.407
2017-07-17 18:07:21 -07:00
Nick Guerrera
6de76e047b Update dotnet/sdk to latest 2017-07-17 17:03:51 -07:00
Nick Guerrera
4ed01d30b8 Merge pull request #7179 from dotnet/nguerrera-update-sdk
Update dotnet/sdk to latest
2017-07-17 16:57:40 -07:00