Commit graph

7609 commits

Author SHA1 Message Date
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
Livar Cunha
caff97a3ee 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. 2018-03-30 13:17:14 -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
d3a78f7d3f Add msbuild myget.org feed 2018-03-30 09:10:10 -07:00
Livar
c5b0ed91f0
Merge pull request #8946 from livarcocc/update_branding_to_104
Updating the branding of the CLI to 2.1.104.
2018-03-29 23:36:36 -07:00
Livar
44d0188781
Merge pull request #8947 from dotnet/update_sdk_2xx
Updating SDK to 2.1.200-preview-62730-02
2018-03-29 23:22:05 -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 Cunha
1e42b63860 Updating the branding of the CLI to 2.1.104. 2018-03-29 21:33: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
Livar
cf9e4e3b15
Merge pull request #8925 from dotnet/nuget.client.release-5052-1-1
Insert NuGet Build 4.7.0-preview3.5052 into cli
2018-03-29 17:47:14 -07:00
Livar
a2e06535b9
Merge pull request #8914 from livarcocc/new_distros_ci
Adding Fedora 27, OpenSuse 43.2 and Ubuntu 18.04 to CI for release/2.1.1xx
2018-03-29 14:22:57 -07:00
Livar Cunha
c4f42d3e6c Adding a step to shutdown the vbcscompiler after test execution. 2018-03-29 11:52:16 -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
Livar
5f15f0a786
Merge pull request #8915 from rainersigwald/MSBuild-15.7.127-2xx
MSBuild 15.7.127.34537 for 2.1.2xx
2018-03-28 10:12:08 -07:00
Livar Cunha
b250271ac1 Removing the dependency on the project.json CLI from the windows build scripts as well. 2018-03-27 16:38:29 -07:00
Rainer Sigwald
56a01638e1 MSBuild 15.7.127.34537 2018-03-27 18:38:03 -05:00