Commit graph

6898 commits

Author SHA1 Message Date
Nick Guerrera
4e92948870 Merge pull request #7254 from dotnet/merges/release/2.0.0-to-master-20170725-070023
Merge release/2.0.0 to master
2017-07-25 15:17:43 -07:00
jbeisner
93a4ae7f35 Merge pull request #7242 from johnbeisner/VSOTest
Trivial change to start a VSO build: dotnet/master
2017-07-24 14:19:34 -07:00
Nick Guerrera
5d07534663 Merge pull request #7223 from livarcocc/resolver_nupkg
Producing a nupkg for Microsoft.NET.MSBuildResolver.
2017-07-24 16:58:15 -04:00
Livar
18ee24c316 Merge pull request #7232 from dotnet/merges/release/2.0.0-to-master-20170724-070022
Merge release/2.0.0 to master
2017-07-24 13:29:28 -07:00
John Beisner
1c1a6f2981 Trivial change. 2017-07-24 11:49:26 -07:00
Livar
e7f57979b7 Merge pull request #7238 from khyperia/update_roslyn_20
Update Roslyn to 2.3.2-beta1-61921-05 in 2.0.0
2017-07-24 11:40:53 -07:00
Ashley Hauck
9ff5da4dd2 Update Roslyn to 2.3.2-beta1-61921-05 in 2.0.0 2017-07-24 10:09:31 -07:00
Livar
e678c04f03 Merge pull request #7221 from dotnet/livarcocc-patch-2
Updating SDK to 2.0.0-preview3-20170721-7
2017-07-22 17:03:12 -07:00
Livar
9c0558b920 Merge pull request #7224 from mlorbetske/dev/mlorbe/UpdateToCoherence26424
Update to Coherence 26424
2017-07-22 17:00:51 -07:00
Mike Lorbetske
2848037380 Update to Coherence 26424 2017-07-21 19:01:49 -07:00
Livar Cunha
1de47f5704 Producing a nupkg for Microsoft.NET.MSBuildResolver. Note that this package contains only the Resolver dll. The hostfxr dll will still have to be acquired separately. 2017-07-21 15:24:59 -07:00
Livar
dfb88456ba Updating SDK to 2.0.0-preview3-20170721-7 2017-07-21 14:42:05 -07:00
Livar
7c087a4121 Merge pull request #7212 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170721-070023
Merge rel/1.1.0 to release/2.0.0
2017-07-21 13:36:40 -07:00
Livar
13d5e92486 Merge pull request #7215 from rainersigwald/msbuild-15.3.409-for-2.0
MSBuild 15.3.409
2017-07-21 13:36:05 -07:00
Livar
a1f43a6960 Merge pull request #7218 from wli3/sdk-update-070721
Updating SDK to 2.0.0-preview3-20170721-5
2017-07-21 13:25:02 -07:00
Livar
a4f2844a19 Merge pull request #7213 from dotnet/merges/release/2.0.0-to-master-20170721-070025
Merge release/2.0.0 to master
2017-07-21 12:51:51 -07:00
Livar
2176ac623c Merge pull request #7211 from mlorbetske/dev/mlorbe/UpdateToCoherence26412
Update to coherence 26412
2017-07-21 12:43:13 -07:00
William Li
d07a5021ac Updating SDK to 2.0.0-preview3-20170721-5 2017-07-21 12:31:54 -07:00
Livar
6ca8afe223 Merge branch 'release/2.0.0' into msbuild-15.3.409-for-2.0 2017-07-21 12:00:23 -07:00
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