Commit graph

661 commits

Author SHA1 Message Date
Livar
53068bb65e
Merge pull request #9115 from dotnet/nuget.client.release-5122-1-1
Insert NuGet Build 4.7.0-rtm.5122 into cli
2018-04-20 16:27:19 -07:00
Livar
6d9a4f1c65
Update SDK to 2.1.200-preview-62820-08 2018-04-20 15:21:46 -07:00
Livar
dc088918f9
Merge pull request #9106 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-04-20 15:12:18 -07:00
NuGet Team Bot
205f58496f Insert NuGet Build 4.7.0-rtm.5122 into cli 2018-04-20 13:09:19 -07:00
Livar
c60ca4c76a
Merge pull request #9093 from dotnet/update_roslyn
Update Roslyn to 2.8.0-dev-62817-01
2018-04-19 13:32:49 -07:00
Livar
04c02b0200
Merge pull request #9019 from mlorbetske/dev/mlorbe/UpdateTestTemplatesFor20To157RTW
Update test templates to use the 15.7.0 test SDK
2018-04-19 12:56:21 -07:00
Nate McMaster
f729fad293
Fix the aspnetcore dependency on .rpm and .deb installers 2018-04-18 22:49:21 -07:00
Livar
3c344c2f83
Update Roslyn to 2.8.0-dev-62817-01 2018-04-18 12:03:42 -07:00
Livar
83d150e87b
Update SDK to 2.1.200-preview-62816-05 2018-04-16 10:38:21 -07:00
NuGet Team Bot
6a3419cedd Insert NuGet Build 4.7.0-rtm.5104 into cli 2018-04-13 14:03:00 -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
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
NuGet Team Bot
d43718d444 Insert NuGet Build 4.7.0-rtm.5081 into cli 2018-04-10 08:49:48 -07:00
Nate McMaster
1860d43323
Update to ASP.NET Core 2.0.7 build 231 2018-04-09 12:14:47 -07:00
Mike Lorbetske
8370f24850 Update test templates to use the 15.7.0 test SDK 2018-04-08 11:57:30 -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
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 Cunha
364ee996bf Fixing another typo in that is breaking RHEL. 2018-04-04 22:43:37 -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
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
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
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
5b8949e66b Updating the runtime to 2.0.7 and the CLI branding to 2.1.104. 2018-03-30 13:17:14 -07:00
Livar
48ec687460
Merge pull request #8953 from dotnet/update_sdk_1xx
Update SDK to 2.1.100-preview-62730-07
2018-03-30 13:03:16 -07:00
Livar
fdcc478420
Merge pull request #8948 from AndyGerlicher/MSBuild15.6.84
MSBuild 15.6.84
2018-03-30 10:41:19 -07:00
Livar
27435ea589
Update SDK to 2.1.100-preview-62730-07
Contains a matching NuGet version to the one in the CLI.
2018-03-30 10:21:43 -07:00
Andy Gerlicher
b84a0eb8b2 MSBuild 15.6.84 2018-03-29 23:11:58 -07:00
Livar Cunha
9ba1de58de Revert the runtime to 2.0.6 because we need to service the SDK with a new NuGet. 2018-03-29 22:29:46 -07:00
Livar
820ea7c54f
Updating SDK to 2.1.200-preview-62730-02
This brings back an SDK with a matching version of NuGet.
2018-03-29 21:59:27 -07:00
Livar
a0bb417c9f
Merge pull request #8926 from dotnet/nuget.client.release-5055-1-1
Insert NuGet Build 4.6.2-rtm-5055 into cli
2018-03-29 21:19:50 -07:00
NuGet Team Bot
c271df6f6a Insert NuGet Build 4.6.2-rtm-5055 into cli 2018-03-28 22:41:18 -07:00
NuGet Team Bot
32ac8d897b Insert NuGet Build 4.7.0-preview3.5052 into cli 2018-03-28 22:39:07 -07:00
Rainer Sigwald
56a01638e1 MSBuild 15.7.127.34537 2018-03-27 18:38:03 -05:00
Livar Cunha
6600612b9e Adding new docker files for opensuse.42.3, ubuntu.18.04 and fedora.27 and removing the project.json CLI from the build. It was not being used anymore. 2018-03-27 10:24:10 -07:00
Mike Lorbetske
b783795dc9 Update test SDK for 2.0 templates in the 15.7 SDK 2018-03-26 14:37:55 -07:00
Livar
3e0cee922d
Update SDK to 2.1.200-preview-62726-02 2018-03-26 09:34:40 -07:00
Livar
ce4d914eda
Merge pull request #8894 from rainersigwald/MSBuild-15.7.122-2.1.2xx
MSBuild 15.7.124 for 2.1.2xx
2018-03-25 19:15:26 -07:00
NuGet Team Bot
00c7557960 Insert NuGet Build 4.7.0-preview3.5039 into cli 2018-03-25 07:29:42 -05:00
Andy Gerlicher
5e6765093a MSBuild 15.7.124-preview 2018-03-25 07:28:29 -05:00
Livar
c3b9a9559d
Merge pull request #8885 from dotnet/update_roslyn_2xx
Update Roslyn to 2.8.0-beta3-62722-05
2018-03-23 18:56:45 -07:00