Commit graph

892 commits

Author SHA1 Message Date
Eric Erhardt
3d1caf1d63
Revert Roslyn update
In order to isolate the changes to find the break.
2018-03-06 09:23:25 -06:00
dotnet-bot
a4eaae7155 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26306-03, preview2-26306-03, preview2-26306-03, beta1-62628-07, respectively 2018-03-06 10:11:12 +00:00
Livar
7a733ffd0e
Merge pull request #8708 from mlorbetske/dev/mlorbe/Update21TestTemplatesTo157
Update 2.1 test templates to use the 15.7 preview 1 test SDK
2018-03-05 11:39:35 -08:00
Livar
68922e2a51
Merge pull request #8657 from dotnet/vramak/WebSdk_Update_2212018
Updating the WebSdk version to 2.1.300-preview2-20180221-1406058
2018-03-02 15:39:19 -08:00
Livar
b84eb1081b
Merge pull request #8702 from dotnet/johluo/update-dotnet-archive
Update Microsoft.DotNet.Archive version
2018-03-01 15:02:50 -08:00
Livar
28223a0caf
Merge pull request #8701 from dotnet/livarcocc-patch-1
Update SDK to 2.1.300-preview2-62628-06
2018-02-28 20:40:33 -08:00
Mike Lorbetske
030b6b406c Update 2.1 test templates to use the 15.7 preview 1 test SDK 2018-02-28 14:51:05 -08:00
Mike Lorbetske
d05a751e59 Update 2.0 test templates for the 15.7 test SDK 2018-02-28 14:43:18 -08:00
danmosemsft
4c36ae18f4 Latest versions 2018-02-28 14:08:35 -08:00
John Luo
309be9c10d Update Microsoft.DotNet.Archive version 2018-02-28 12:19:27 -08:00
danmosemsft
3965ce7047 Updated core-setup 2018-02-28 11:00:10 -08:00
danmosemsft
8a6a642d66 01 2018-02-28 11:00:09 -08:00
danmosemsft
d00060d449 Use core-setup version 2018-02-28 11:00:08 -08:00
Dan Moseley
6c0944a017 Update again 2018-02-28 11:00:08 -08:00
Dan Moseley
99b55ce247 Update to latest CoreFX manually 2018-02-28 11:00:07 -08:00
danmosemsft
b3a14f1ec9 Merge with master 2018-02-28 11:00:07 -08:00
dotnet-bot
bcbbf6634f Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26219-02, preview2-26219-02, preview2-26219-02, beta1-62616-10, respectively 2018-02-28 11:00:06 -08:00
Livar
a631900fa7
Update SDK to 2.1.300-preview2-62628-06
Carries the fix for the preview message.
2018-02-28 10:35:05 -08:00
Jeff Kluge
6944a40878
MSBuild 15.7.63 (#8696)
* Update package version to 15.7.0-preview-000063
* Add dotnet.myget.org msbuild feed
2018-02-27 17:53:54 -08:00
Mike Lorbetske
78efe50e65 Update to the 15.6 RTM version of the test SDK in templates 2018-02-27 12:41:58 -08:00
Livar
59746d409c
Merge branch 'master' into vramak/WebSdk_Update_2212018 2018-02-27 10:48:43 -08:00
Livar
6b2d44ba5f
Merge pull request #8684 from abhishkk/testPlatformInsertion
TestPlatform 15.7 preview insertion
2018-02-26 10:44:45 -08:00
abhishk
6ea849b7ef TestPlatform 15.7 preview insertion 2018-02-26 11:36:25 +05:30
Livar Cunha
abec8bb31e Updating the version of ASP.NET 2018-02-23 15:00:25 -08:00
Pranav K
d5169549fc
Also update Microsoft.AspNetCore.App 2018-02-22 10:03:32 -08:00
Pranav K
c210f7c360 Update Razor Sdk version to 2.1.0-preview2-30169 2018-02-22 07:10:45 -08:00
Nick Guerrera
47ded461b6
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-02-21 15:58:55 -08:00
vramak
60651922bb Update the WebSdk Version to 2.0.0-rel-20180221-676 2018-02-21 14:16:54 -08:00
vramak
47d0d07fb8 Updating the WebSdk version to 2.1.300-preview2-20180221-1406058 2018-02-21 11:27:58 -08:00
John Luo
9c6da08d66
Update to consume aspnetcore 2.0.6-10011 2018-02-20 16:53:38 -08:00
Nick Guerrera
481a8146e2
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-02-20 16:10:04 -08:00
Nick Guerrera
618650adec
Merge pull request #8641 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-02-20 16:06:43 -08:00
Nick Guerrera
7ba0ded366
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-02-20 16:04:32 -08:00
Livar Cunha
955005602e Merge branch 'release/2.1.1xx' into merge_release_211xx_into_release_211xx_msrc
* release/2.1.1xx:
  Update SDK to 2.1.100-preview-62617-01
2018-02-16 21:58:04 -08:00
Livar
51469d6253
Update SDK to 2.1.100-preview-62617-01 2018-02-16 21:13:41 -08:00
Pranav K
1e9f85d35a Update versions of Web and Razor Sdk 2018-02-16 18:06:47 -08:00
NuGet Team Bot
29ce191177 Insert NuGet Build 4.7.0-preview1-4927 into cli 2018-02-16 14:13:05 -08:00
Livar
6023fa4506
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-02-16 09:31:09 -08:00
jagarg
c618b6fcbb Updating TestPlatform to 15.6 RTM 2018-02-16 18:44:31 +05:30
Peter Huene
f359a1f842
Merge branch 'release/2.1.1xx' release/2.1.1xx-MSRC
* release/2.1.1xx:
  Updating Roslyn to 2.7.0-beta3-62615-05
  Update FSharp Compiler
  Fix README.md for 2.1.1xx (#8600)
  MSBuild 15.6.82
  Update fsharp
2018-02-15 13:32:16 -08:00
Livar
4810eff390 Update ASP.NET version to 2.1.0-preview2-30106 2018-02-15 12:23:35 -08:00
Livar Cunha
f19b3fddc9 Merge remote-tracking branch 'dotnet/release/2.1.3xx' into merges/release/2.1.3xx-to-master
* dotnet/release/2.1.3xx:
  Update to aspnetcore 2.1.0-preview1-28275 and react to feed layout changes (#8611)
  "ExternalRestoreSources" needs to be set in the docker container (#8602)
  Signing nupkg contents (Cli.Utils and MSBuildResolver) along with the rest of the compiled assemblies.
  Use satellites from roslyn package, not cli-deps-satellites
  Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
  Support TildeSlash expand (#8589)
  Port Kernel Version telemetry to preview1
  Do not create a directory with a trailing space; it cannot be deleted by conventional methods. (#8587)
  Consume generic aspnetcore rpm installers
  Insert NuGet Build 4.6.0-rtm-4918 into cli
  Adding roslyn to automatic dependency flow through maestro.
  Fixing update dependency by using the new APIs. We broke this when we updated the version of VersionTools.
  MSBuild 15.6.81
  Update SDK to 2.1.300-preview1-62608-07
  MSBuild 15.6.80

 Conflicts:
	build/DependencyVersions.props
	test/Microsoft.DotNet.ShellShim.Tests/ShellShimMakerTests.cs
2018-02-15 11:57:36 -08:00
Livar
58ae49cb90
Merge branch 'release/2.1.1xx' into UpdateFSharpCompiler 2018-02-15 11:21:20 -08:00
Livar
f2d6d36cc6
Updating Roslyn to 2.7.0-beta3-62615-05 2018-02-15 10:16:20 -08:00
Kevin Ransom
020c57923c Update FSharp Compiler 2018-02-14 16:52:45 -08:00
Livar
4695e3bc30
Merge pull request #8594 from KevinRansom/UpdateFSharp
Update fsharp
2018-02-14 16:14:45 -08:00
Livar
99fc344435
Merge branch 'release/2.1.1xx' into UpdateFSharp 2018-02-14 15:20:45 -08:00
Livar Cunha
7e32b9a593 Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx
* dotnet/release/2.1.2xx:
  Use satellites from roslyn package, not cli-deps-satellites
  Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
2018-02-14 15:18:29 -08:00
Andy Gerlicher
bbd1b50a17 MSBuild 15.6.82 2018-02-14 15:09:12 -08:00
Pranav K
9bf75f06fb Update Sdk versions 2018-02-14 13:42:47 -08:00