Commit graph

1075 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
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
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
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
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
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
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
Nick Guerrera
6de76e047b Update dotnet/sdk to latest 2017-07-17 17:03:51 -07:00
Nick Guerrera
b606267b0d Update dotnet/sdk to latest 2017-07-17 16:16:14 -07:00
Nick Guerrera
0b467f1954 Merge pull request #7167 from weshaggard/UpdateNetFxSupportPackage
Update the .NET Framework Support package
2017-07-17 15:58:24 -07:00
Wes Haggard
7eb8260a2f Update the .NET Framework Support package
Need to update in order to get the fix https://github.com/dotnet/corefx/pull/22248
2017-07-17 14:03:58 -07:00
seancpeters
3c4be26876 updating to coherence 26343 & templating build 288 2017-07-17 14:01:01 -07:00
Rainer Sigwald
dd47000924 MSBuild 15.3.407 2017-07-17 15:52:50 -05:00
Nick Guerrera
feec3b7661 Merge pull request #7177 from dotnet/ragrawal-updatenuget4294
update nuget to 4.3.0-rtm-4294
2017-07-17 13:18:59 -07:00
Nick Guerrera
b85bf521dd Merge pull request #7170 from dotnet-bot/release/2.0.0-UpdateDependencies
Update CoreSetup to preview3-25516-01 (release/2.0.0)
2017-07-17 13:18:33 -07:00
Rohit Agrawal (NUGET)
689148b133 update nuget to 4.3.0-rtm-4294 2017-07-17 12:28:43 -07:00
John Beisner
97f527d661 If "ReleaseSuffix" is already set, honor that value. 2017-07-17 10:31:25 -07:00
dotnet-bot
8d0b1e6106 Update CoreSetup to preview3-25516-01 2017-07-16 17:27:22 +00:00
seancpeters
762709d148 updating the template engine version also 2017-07-14 15:45:14 -07:00
seancpeters
48285bafaf Update to Coherence 26318 - templating build 287 2017-07-14 15:28:30 -07:00
dotnet-bot
57ef63f491 Update CoreSetup to preview3-25514-02 2017-07-14 18:07:31 +00:00
Nick Guerrera
db5e7576d0 Merge pull request #7159 from jainaashish/asja-UpdateNuGet-release
Updating NuGet version to 4.3.0-preview4-4273
2017-07-13 16:34:23 -07:00
seancpeters
f762870deb use dotnet/templating build 286 (#7155) 2017-07-13 16:28:37 -07:00
William Li
5e5cd87363 Rename to AspNetCoreRuntimePackageTimestamp 2017-07-13 14:59:00 -07:00
Ashish Jain (NUGET)
d24c861929 Updating NuGet version to 4.3.0-preview4-4273 2017-07-13 14:37:10 -07:00