Commit graph

7489 commits

Author SHA1 Message Date
Peter Huene
075bf14db6
Merge branch 'release/2.1.1xx-MSRC' into release/2.1.1xx
* release/2.1.1xx-MSRC: (21 commits)
  Update to consume aspnetcore 2.0.6-10011
  Update SDK to 2.1.100-preview-62617-01
  Updating Roslyn to 2.7.0-beta3-62615-05
  Update FSharp Compiler
  Fix README.md for 2.1.1xx (#8600)
  MSBuild 15.6.82
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  Update fsharp
  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.
  ...
2018-03-13 15:01:01 -07: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
Nick Guerrera
b9e74c6520
Merge pull request #8660 from nguerrera/trigger-build
Trigger build with unambiguous commit height
2018-02-21 18:04:22 -08:00
Nick Guerrera
fa9ecf5483 (empty commit) 2018-02-21 14:10:20 -08:00
Nick Guerrera
bc712af451 (empty commit) 2018-02-21 14:10:18 -08:00
Nick Guerrera
0d8fbccb98 (empty commit) 2018-02-21 14:10:15 -08:00
Nick Guerrera
8e9be230c0 (empty commit) 2018-02-21 14:10:10 -08:00
Nick Guerrera
b2d02701c6 (empty commit) 2018-02-21 14:10:07 -08:00
Nick Guerrera
f1c16b69c9 (empty commit) 2018-02-21 14:10:06 -08:00
Nick Guerrera
9602002483 (empty commit) 2018-02-21 14:10:05 -08:00
Nick Guerrera
3dfe29fe7a (empty commit) 2018-02-21 14:10:04 -08:00
Nick Guerrera
c2c673a114 (empty commit) 2018-02-21 14:10:02 -08:00
Nick Guerrera
ba3e79f8ac (empty commit) 2018-02-21 14:09:57 -08:00
Nick Guerrera
cba84e1781 (empty commit) 2018-02-21 14:09:52 -08:00
Peter Huene
6c22303bf0 Merged PR 107360: Update to consume aspnetcore 2.0.6-10011
Update to consume aspnetcore 2.0.6-10011
2018-02-21 00:54:49 +00:00
John Luo
9c6da08d66
Update to consume aspnetcore 2.0.6-10011 2018-02-20 16:53:38 -08:00
Livar Cunha
2445b0f28d Merged PR 107092: Merge release/2.1.1xx to release/2.1.1xx-MSRC 2018-02-17 05:59:33 +00: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
08d21683d6
Merge pull request #8638 from dotnet/update_sdk
Update SDK to 2.1.100-preview-62617-01
2018-02-16 21:55:18 -08:00
Livar
51469d6253
Update SDK to 2.1.100-preview-62617-01 2018-02-16 21:13:41 -08:00
jagarg
c618b6fcbb Updating TestPlatform to 15.6 RTM 2018-02-16 18:44:31 +05:30
Peter Huene
a08229178d Merged PR 106752: Merge release/2.1.1xx to release/2.1.1xx-MSRC 2018-02-15 21:36:38 +00:00
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
4604466afb
Merge pull request #8620 from KevinRansom/UpdateFSharpCompiler
Update FSharp Compiler
2018-02-15 13:09:38 -08:00
Livar
58ae49cb90
Merge branch 'release/2.1.1xx' into UpdateFSharpCompiler 2018-02-15 11:21:20 -08:00
Livar
1db8e4c62a
Merge pull request #8623 from dotnet/update_roslyn
Updating Roslyn to 2.7.0-beta3-62615-05
2018-02-15 11:04:53 -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
cfc6b3d0a1
Merge pull request #8616 from AndyGerlicher/MSBuild15.6.82
MSBuild 15.6.82
2018-02-14 16:14:25 -08:00
Nick Guerrera
dbce65da30
Fix README.md for 2.1.1xx (#8600)
It was still pointing to 15.5 downloads
2018-02-14 15:28:49 -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
ce62d3db19 Merged PR 106551: Merge release/2.1-MSRC to release/2.1.1xx-MSRC 2018-02-14 20:58:57 +00: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
94316e269e Merged PR 106425: Update the branding of the CLI to 2.1.101
Update the branding of the CLI to 2.1.101
2018-02-14 18:07:30 +00:00
Peter Huene
83f53da055 Merged PR 106480: Updating runtime to 2.0.6.
Updating runtime to 2.0.6.
2018-02-14 18:07:18 +00:00
Peter Huene
32eeb5ddd5
Updating runtime to 2.0.6. 2018-02-13 18:54:35 -08:00
Pranav Krishnamoorthy
7b43526c6c Merged PR 106465: Update AspNetCore version
Update AspNetCore version
2018-02-14 02:01:30 +00:00
Pranav K
3547a1227c Update AspNetCore version 2018-02-13 17:54:33 -08:00
Peter Huene
c8c08433a7
Update the branding of the CLI to 2.1.101 2018-02-13 16:19:35 -08:00
Peter Huene
0370ac2681 Merged PR 106422: Merge release/2.1-MSRC to release/2.1.1xx-MSRC
This also merges release/2.1.1xx to release/2.1.1xx-MSRC (no conflicts)
2018-02-14 00:10:45 +00: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
a2b679e1d2
Merge branch 'release/2.1.1xx' into release/2.1.1xx-MSRC
* release/2.1.1xx: (25 commits)
  Use satellites from roslyn package, not cli-deps-satellites
  Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
  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
  MSBuild 15.6.80
  Adding the VBCSCompiler to the list of signed files due to crossgen.
  Remove obsolete F# satellite package
  MSBuild 15.6.76
  Update F# to match dev15.6 preview 4
  Excluding shared framework assemblies from the Roslyn folder in the SDK.
  Insert NuGet Build 4.6.0-rtm-4880 into cli
  Updating Roslyn to 2.7.0-beta3-62529-05.
  Update fsharp compiler to match preview 4
  Insert NuGet Build 4.6.0-rtm-4862 into cli
  MSBuild 15.6.70
  Insert NuGet Build 4.6.0-rtm-4859 into cli
  MSBuild 15.6.69
  Update package reference
  ...
2018-02-13 15:43:11 -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
8265c551de
Merge pull request #8595 from nguerrera/update-roslyn-2.1.1xx
Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
2018-02-13 10:56:05 -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