Commit graph

7580 commits

Author SHA1 Message Date
Nate McMaster
2d59528389 Merged PR 118480: Update to ASP.NET Core 2.0.8 build 10026
Update to ASP.NET Core 2.0.8 build 10026.

FYI @<Stephen Halter> - includes your latest Kestrel changes.
2018-04-24 14:54:42 +00:00
Nate McMaster
0b885eee23
Update to ASP.NET Core 2.0.8 build 10026 2018-04-23 20:02:08 -07:00
Nate McMaster
064879cfed Merged PR 118158: Update to ASP.NET Core 2.0.8 build 10024
Update to ASP.NET Core 2.0.8 build 10024.
2018-04-23 16:42:38 +00:00
Nate McMaster
68add55652
Update to ASP.NET Core 2.0.8 build 10024 2018-04-20 16:52:01 -07:00
Livar
bd3372b5a3
Merge pull request #9074 from dotnet/update_sdk
Update SDK to 2.1.200-preview-62816-05
2018-04-16 13:08:12 -07:00
Livar
83d150e87b
Update SDK to 2.1.200-preview-62816-05 2018-04-16 10:38:21 -07:00
Livar
1e1c6d5ea3
Merge pull request #9067 from dotnet/nuget.client.release-5104-1-1
Insert NuGet Build 4.7.0-rtm.5104 into cli
2018-04-13 17:08:43 -07:00
NuGet Team Bot
6a3419cedd Insert NuGet Build 4.7.0-rtm.5104 into cli 2018-04-13 14:03:00 -07:00
John Beisner
4525ae3969
Merge pull request #9065 from dotnet/nuget.client.release-5096-4-1
Insert NuGet Build 4.7.0-rtm.5096 into cli
2018-04-13 12:11:14 -07:00
NuGet Team Bot
0ed1ffb8dd Insert NuGet Build 4.7.0-rtm.5096 into cli 2018-04-13 10:44:27 -07:00
Livar
351095d077
Merge pull request #9058 from dotnet/update_sdk
Update SDK to 2.1.200-preview-62812-03
2018-04-11 23:11:22 -07:00
Livar
fef4ae58af
Update SDK to 2.1.200-preview-62812-03 2018-04-11 22:23:35 -07:00
Livar
f31e8d26d6
Merge pull request #9045 from AndyGerlicher/MSBUild-15.7.163
MSBuild 15.7.163
2018-04-11 12:03:53 -07:00
John Beisner
a543dd3084
Merge pull request #9034 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-04-11 09:27:10 -07:00
Livar
1581af4503
Merge pull request #9040 from dotnet/nuget.client.release-5081-1-1
Insert NuGet Build 4.7.0-rtm.5081 into cli
2018-04-10 16:35:08 -07:00
Andy Gerlicher
51214d02b1 MSBuild 15.7.163 2018-04-10 15:59:50 -07:00
Livar
5f528cf548
Merge pull request #9016 from KevinRansom/updatevs2017.4
Align dotnetcli with VS2017.4 compiler
2018-04-10 11:05:52 -07:00
Livar Cunha
18dd8107f2 Removing the explicit dependency on System.Diagnostics.Process from Cli.Utils. Use the assembly from netstandard. 2018-04-10 10:37:09 -07:00
NuGet Team Bot
d43718d444 Insert NuGet Build 4.7.0-rtm.5081 into cli 2018-04-10 08:49:48 -07:00
Livar
141cc8d976
Merge pull request #9025 from natemcmaster/aspnet-207-231
Update to ASP.NET Core 2.0.7 build 231
2018-04-09 14:14:59 -07:00
Nate McMaster
1860d43323
Update to ASP.NET Core 2.0.7 build 231 2018-04-09 12:14:47 -07:00
Kevin Ransom
8fa1c8230b Align dotnetcli with VS2017.4 compiler 2018-04-06 10:52:34 -07:00
Livar
6179a01514
Merge pull request #9006 from dotnet/update_sdk
Updating SDK to 2.1.200-preview-62805-05
2018-04-05 15:30:46 -07:00
Livar
c43ea1458e
Merge pull request #9005 from livarcocc/merge_1xx_into_2xx
Merge release/2.1.1xx into release/2.1.2xx
2018-04-05 13:26:10 -07:00
Livar
e545b4c7a6
Merge pull request #8991 from mayankbansal018/testPlatformRTM
Insert Testplatform 15.7 RTM
2018-04-05 09:43:51 -07:00
Livar
d0aca6fb7b
Updating SDK to 2.1.200-preview-62805-05 2018-04-05 09:43:20 -07:00
Livar Cunha
2e2a8d6179 Merge branch 'release/2.1.1xx' into merge_1xx_into_2xx
* release/2.1.1xx:
  Fixing another typo in that is breaking RHEL.
  Fix a typo in the rpm.targets when testing the rpm generated packages.
  Update to aspnet 2.0.7 build 230
  Producing an empty commit to trigger a rebuild of the CLI
  Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl
  Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0.
  Reverse the order in which old runtime stores are listed
  Update to ASP.NET Core 2.0.7 build 228
  Moving the opensuse 43.2 docker file to the right folder.
  Updating the CLI branding to 2.1.105, to go over the 104 release we will have to do for NuGet. Also, fixed the branding of the runtime in our installers to 2.0.7.
  Updating the runtime to 2.0.7 and the CLI branding to 2.1.104.
  Update SDK to 2.1.100-preview-62730-07
  Add msbuild myget.org feed
  MSBuild 15.6.84

 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-04-05 09:40:35 -07:00
Livar
3962910e5f
Merge pull request #8949 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-04-05 09:14:06 -07:00
Livar
fe590c614c
Merge pull request #9002 from livarcocc/fix_rhel_typo_2
Fixing another typo that is breaking RHEL.
2018-04-05 08:58:37 -07:00
Livar Cunha
364ee996bf Fixing another typo in that is breaking RHEL. 2018-04-04 22:43:37 -07:00
Livar
58792f58b6
Merge pull request #8994 from livarcocc/fix_typo
Fix a typo in the rpm.targets when testing the rpm generated packages.
2018-04-04 14:33:01 -07:00
Livar Cunha
9fb0f9a35b Fix a typo in the rpm.targets when testing the rpm generated packages. 2018-04-04 13:14:13 -07:00
Livar
721c068376
Merge branch 'release/2.1.2xx' into merges/release/2.1.1xx-to-release/2.1.2xx 2018-04-04 10:15:45 -07:00
Livar
3ce82497ef
Merge pull request #8988 from natemcmaster/aspnet-207-230
Update to aspnet 2.0.7 build 230
2018-04-04 09:04:43 -07:00
Mayank Bansal
674f64c4c7 Insert Testplatform 15.7 RTM package in dotnet SDK 2018-04-04 14:08:12 +05:30
Nate McMaster
21529f350d
Update to aspnet 2.0.7 build 230 2018-04-03 17:21:31 -07:00
Livar
9ca1ed7969
Merge pull request #8985 from dotnet/livarcocc-patch-1
Producing an empty commit to trigger a rebuild of the CLI
2018-04-03 16:21:49 -07:00
Livar
de09fb5104
Producing an empty commit to trigger a rebuild of the CLI
The runtime had to spin in place and as such we need a "fake" commit to trigger a CLI rebuild using the new runtime bits.
2018-04-03 16:20:11 -07:00
Livar
dc62e50c3a
Merge pull request #8975 from dotnet/update_sdk_2xx
Updating SDK to 2.1.200-preview-62803-04
2018-04-02 22:38:47 -07:00
Livar
3f05bb71ab
Updating SDK to 2.1.200-preview-62803-04
This contains a matching NuGet version to the one in the CLI.
2018-04-02 21:51:23 -07:00
Livar
10da9748fe
Merge pull request #8966 from dotnet/livarcocc-patch-1
Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl
2018-04-02 13:37:52 -07:00
Livar
591f8ddeaf
Merge pull request #8965 from dotnet/nuget.client.release-5059-1-1
Insert NuGet Build 4.7.0-preview3.5059 into cli
2018-04-02 13:00:19 -07:00
Livar
beea8c2e9b Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl
CoreSetupBlobRootUrl determines from which blob storage the CLI consumes bits. That's the right URL to use for consuming asp.net bits as well.
2018-04-02 11:09:22 -07:00
NuGet Team Bot
15c631b022 Insert NuGet Build 4.7.0-preview3.5059 into cli 2018-04-02 10:36:26 -07:00
Livar
12acb315d9
Merge pull request #8951 from natemcmaster/aspnet-2.0.7
Update to ASP.NET Core 2.0.7 build 228
2018-04-02 10:32:24 -07:00
Livar
19b0b1c8ed
Merge pull request #8945 from livarcocc/update_runtime_for_20
Updating the runtime to 2.0.7 and the CLI branding to 2.1.105.
2018-03-30 20:50:29 -07:00
Livar Cunha
370243ab81 Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0. 2018-03-30 17:57:03 -07:00
Nate McMaster
c20f79e8e3
Reverse the order in which old runtime stores are listed 2018-03-30 17:51:08 -07:00
Nate McMaster
c5f3e09520
Update to ASP.NET Core 2.0.7 build 228
- Remove unused myget feeds
- Refactor how we keep track of all previous versions of the runtime store
2018-03-30 15:36:48 -07:00
Livar Cunha
9b68d55059 Moving the opensuse 43.2 docker file to the right folder. 2018-03-30 13:24:07 -07:00