Commit graph

607 commits

Author SHA1 Message Date
Andy Gerlicher
5e6765093a MSBuild 15.7.124-preview 2018-03-25 07:28:29 -05:00
Livar Cunha
0d22280e08 Update msbuild to 15.7.0-preview-000122 2018-03-23 12:25:16 -07:00
Andy Gerlicher
c4cae059a9 MSBuild 15.7.108
* Add feed to msbuild myget
* Update MSBuild to 15.7.108 (contains both netcoreapp2.0 and
netcoreapp2.1)
2018-03-22 16:08:18 -07:00
Livar
bca991fddb
Update SDK to 2.1.200-preview-62717-01 2018-03-16 17:57:25 -07:00
Livar
e2c3f7e3d4
Updating the SDK to 2.1.200-preview-62716-06. 2018-03-16 13:32:07 -07:00
Livar
eeca22fc71
Updating the SDK to 2.1.200-preview-62716-04 2018-03-15 21:23:22 -07:00
Livar
b0acac94b8
Update SDK to 2.1.200-preview-62715-08 2018-03-15 17:08:38 -07:00
Livar
8fd0e7317d
Updating Roslyn to 2.8.0-beta2-62713-11 2018-03-13 20:26:51 -07:00
Livar Cunha
b87e9521cd Merge branch 'release/2.1.1xx' into merge_release_211xx_into_release_212xx
* release/2.1.1xx: (21 commits)
  Updating the SDK version to 2.1.100-preview-62714-01
  Updating the branding of the CLI to 2.1.102.
  Remove cli-deps from sources.
  Update Roslyn to 2.7.0-beta3-62707-11
  Update to the 15.6 RTM version of the test SDK in templates
  Update to consume aspnetcore 2.0.6-10011
  Updating TestPlatform to 15.6 RTM
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  Build trigger commit.
  Update to consume aspnetcore 2.0.6-10008 notimestamp build
  Update to consume aspnetcore 2.0.6-10008 timestamp build
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
  Making a document only commit to trigger another build of the CLI.
  Add 2.0.5 ASP.NET store to native installers.
  Update to consume aspnetcore 2.0.6-10007
  Fix Windows servicing builds.
  Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
  Update runtime and branding to 2.0.6.
  ...

 Conflicts:
	build/Branding.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Version.props
	packaging/osx/clisdk/resources/cs.lproj/conclusion.html
	packaging/osx/clisdk/resources/de.lproj/conclusion.html
	packaging/osx/clisdk/resources/en.lproj/conclusion.html
	packaging/osx/clisdk/resources/es.lproj/conclusion.html
	packaging/osx/clisdk/resources/fr.lproj/conclusion.html
	packaging/osx/clisdk/resources/it.lproj/conclusion.html
	packaging/osx/clisdk/resources/ja.lproj/conclusion.html
	packaging/osx/clisdk/resources/ko.lproj/conclusion.html
	packaging/osx/clisdk/resources/pl.lproj/conclusion.html
	packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
	packaging/osx/clisdk/resources/ru.lproj/conclusion.html
	packaging/osx/clisdk/resources/tr.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
	packaging/windows/clisdk/bundle.wxl
2018-03-13 20:23:33 -07:00
Livar
8d409357db
Merge pull request #8785 from dotnet/update_sdk
Updating the SDK version to 2.1.100-preview-62714-01
2018-03-13 20:16:10 -07:00
Livar
a662fda7aa
Merge pull request #8783 from dotnet/update_roslyn
Update Roslyn to 2.7.0-beta3-62707-11
2018-03-13 18:10:10 -07:00
Livar
2e7d92be25
Updating the SDK version to 2.1.100-preview-62714-01 2018-03-13 18:09:31 -07:00
Peter Huene
8444cb04b5
Merge pull request #8781 from peterhuene/msrc-merge
Merge release/2.1.1xx-MSRC to release/2.1.1xx
2018-03-13 17:34:13 -07:00
Livar
b197f75b45
Update Roslyn to 2.7.0-beta3-62707-11 2018-03-13 16:42:22 -07:00
Livar
fa5b011266
Merge pull request #8693 from mlorbetske/dev/mlorbe/UpdateTestTemplatesFor156
Update to the 15.6 RTM version of the test SDK in templates
2018-03-13 16:31:35 -07:00
Livar
e606c10013
Merge pull request #8630 from jayaranigarg/tpv2rtm15.6
Branding changes for  TestPlatform 15.6 RTM
2018-03-13 16:31:08 -07:00
NuGet Team Bot
90eed38b2d Insert NuGet Build 4.7.0-preview1.4982 into cli 2018-03-12 15:48:04 -07:00
Mike Lorbetske
d05a751e59 Update 2.0 test templates for the 15.7 test SDK 2018-02-28 14:43:18 -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
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
vramak
60651922bb Update the WebSdk Version to 2.0.0-rel-20180221-676 2018-02-21 14:16:54 -08:00
John Luo
9c6da08d66
Update to consume aspnetcore 2.0.6-10011 2018-02-20 16:53:38 -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
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
NuGet Team Bot
29ce191177 Insert NuGet Build 4.7.0-preview1-4927 into cli 2018-02-16 14:13:05 -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
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
Andy Gerlicher
bbd1b50a17 MSBuild 15.6.82 2018-02-14 15:09:12 -08:00
Peter Huene
7cf46327ee
Merge branch 'release/2.1-MSRC' into release/2.1.1xx-MSRC
* release/2.1-MSRC:
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Build trigger commit.
  Update to consume aspnetcore 2.0.6-10008 notimestamp build
  Update to consume aspnetcore 2.0.6-10008 timestamp build
2018-02-14 11:54:48 -08:00
Peter Huene
32eeb5ddd5
Updating runtime to 2.0.6. 2018-02-13 18:54:35 -08:00
Pranav K
3547a1227c Update AspNetCore version 2018-02-13 17:54:33 -08:00
Peter Huene
118e5e56b5
Merge branch 'release/2.1-MSRC' into release/2.1.1xx-MSRC
* release/2.1-MSRC:
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
  Making a document only commit to trigger another build of the CLI.
  Add 2.0.5 ASP.NET store to native installers.
  Update to consume aspnetcore 2.0.6-10007
  Fix Windows servicing builds.
  Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
  Update runtime and branding to 2.0.6.

* Conflicts:
  build/Branding.props
  build/Version.props
  packaging/osx/clisdk/resources/cs.lproj/conclusion.html
  packaging/osx/clisdk/resources/de.lproj/conclusion.html
  packaging/osx/clisdk/resources/en.lproj/conclusion.html
  packaging/osx/clisdk/resources/es.lproj/conclusion.html
  packaging/osx/clisdk/resources/fr.lproj/conclusion.html
  packaging/osx/clisdk/resources/it.lproj/conclusion.html
  packaging/osx/clisdk/resources/ja.lproj/conclusion.html
  packaging/osx/clisdk/resources/ko.lproj/conclusion.html
  packaging/osx/clisdk/resources/pl.lproj/conclusion.html
  packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
  packaging/osx/clisdk/resources/ru.lproj/conclusion.html
  packaging/osx/clisdk/resources/tr.lproj/conclusion.html
  packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
  packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
  packaging/windows/clisdk/bundle.wxl
2018-02-13 16:00:27 -08:00
Peter Huene
2f46bd7edd
Merge branch 'release/2.1' into release/2.1-MSRC
* release/2.1:
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
2018-02-13 15:23:32 -08:00
Nick Guerrera
bc1fb44364 Use satellites from roslyn package, not cli-deps-satellites 2018-02-12 16:52:26 -08:00
Nick Guerrera
8fcbb631c9 Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx 2018-02-12 15:56:07 -08:00
Kevin Ransom
2f9d8f8f9c Update fsharp 2018-02-12 11:38:37 -08:00
Livar
0468da6ada
Merge pull request #8575 from rainersigwald/msbuild-15.6.81
MSBuild 15.6.81
2018-02-12 09:41:24 -08:00
Livar
04dc2d19ca
Merge pull request #8580 from dotnet/nuget.client.release-4918-1-1
Insert NuGet Build 4.6.0-rtm-4918 into cli
2018-02-10 16:32:36 -08:00
NuGet Team Bot
6003685b86 Insert NuGet Build 4.6.0-rtm-4918 into cli 2018-02-09 10:52:38 -08:00
Livar Cunha
978957315b Fixing update dependency by using the new APIs. We broke this when we updated the version of VersionTools. 2018-02-09 10:31:53 -08:00
Rainer Sigwald
eecb8f63a5 MSBuild 15.6.81 2018-02-09 09:43:55 -06:00
Andy Gerlicher
e0d138e0df MSBuild 15.6.80 2018-02-07 19:24:28 -08:00
Nick Guerrera
cdf3901658
Merge pull request #8498 from livarcocc/update_roslyn
Updating Roslyn to 2.7.0-beta3-62529-05.
2018-02-05 10:28:30 -08:00