Commit graph

400 commits

Author SHA1 Message Date
Brett V. Forsgren
77e289b114 Merge remote-tracking branch 'upstream/release/2.0.0' into merges/release/2.0.0-to-master-20170814-070029 2017-08-14 13:59:06 -07:00
William Lee
cda49654db Merge pull request #7371 from dotnet/merges/release/2.0.0-to-master-20170804-070030
Merge release/2.0.0 to master
2017-08-04 15:14:37 -07:00
Nick Guerrera
8c654cb9e1 Bump SDK version to align nuget versions 2017-08-04 00:53:05 -07:00
NuGet Team Bot
d4dd50210d Insert NuGet Build 4.3.0-rtm-4382 into cli 2017-08-03 21:58:34 -07:00
Mike Lorbetske
94cadf390b Update templates to 1.0.0-beta2-20170803-303 2017-08-03 10:38:33 -07:00
Livar
96b122e26f Merge branch 'master' into merges/release/2.0.0-to-master-20170731-070024 2017-07-31 11:00:18 -07:00
Livar
53f6fe597f Update SDK to 2.0.0-preview3-20170728-1
Contains the new error message for .NET Framework referencing NetStandard 1.5 and 1.6 without the 2.0 SDK.
2017-07-27 18:39:08 -07:00
Livar
39abdb1ef6 Merge pull request #7302 from dotnet/livarcocc-patch-1
Update SDK to 2.0.0-preview3-20170727-2
2017-07-27 16:37:35 -07:00
Livar
d864d60090 Update SDK to 2.0.0-preview3-20170727-2 2017-07-27 15:03:18 -07:00
Mike Lorbetske
09cfa32e5b Absorb update to MSTest version 2017-07-27 12:44:00 -07:00
Livar
6a67932370 Merge pull request #7297 from wli3/update-sdk-version
Update SDK to 2.0.0-preview3-20170727-1
2017-07-27 11:27:02 -07:00
William Li
68d211795a Update SDK to 2.0.0-preview3-20170727-1 2017-07-27 10:41:36 -07:00
Steve Sanderson
5af7786c45 Update SPA templates to 1.0.417 2017-07-27 15:16:29 +01:00
Nick Guerrera
9294718d8d Update Roslyn and F# satellites 2017-07-26 18:24:30 -07:00
Livar
f80fac2c51 Merge pull request #7270 from dotnet/merges/release/2.0.0-to-master-20170726-070023
Merge release/2.0.0 to master
2017-07-26 16:20:23 -07:00
Livar
e4a52e57b9 Update SDK to 2.0.0-preview3-20170726-3 2017-07-26 09:21:15 -07:00
Mike Lorbetske
f4d774b58c Switch to picking up the no-timestamp runtime store and package cache 2017-07-25 20:54:44 -07:00
Nick Guerrera
e126145d35 Merge pull request #7262 from seancpeters/update_to_coherence_26452
updating to coherence 26452 & templating build 300
2017-07-25 17:48:07 -07:00
Nick Guerrera
44638af313 Merge pull request #7230 from dotnet/nuget-insertbuild4324
Insert NuGet Build 4.3.0-rtm-4324 into cli
2017-07-25 15:50:49 -07:00
seancpeters
70d18839af updating to coherence 26452 & templating build 300 2017-07-25 15:39:33 -07:00
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
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
Ashley Hauck
9ff5da4dd2 Update Roslyn to 2.3.2-beta1-61921-05 in 2.0.0 2017-07-24 10:09:31 -07:00
NuGet Team Bot
81b9379536 Insert NuGet Build 4.3.0-rtm-4324 into cli 2017-07-23 16:23:47 -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
Mike Lorbetske
2848037380 Update to Coherence 26424 2017-07-21 19:01:49 -07:00
Livar
dfb88456ba Updating SDK to 2.0.0-preview3-20170721-7 2017-07-21 14:42:05 -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
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
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
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
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
NuGet Team Bot
6da75e02a4 Insert NuGet Build 4.3.0-rtm-4315 into cli 2017-07-20 12:48:04 -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
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
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
Livar
1728aef325 Merge branch 'master' into merges/release/2.0.0-to-master-20170718-070024 2017-07-18 15:58:34 -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