mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7596 commits 41 branches 190 tags 95 MiB
Commit graph

7596 commits

This branch
This branch
All branches
Author SHA1 Message Date
jbeisner
8ff0797b10 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-25 18:34:16 +00:00
Livar
e17cc69763
Merge pull request #9134 from dotnet/update_roslyn_2xx 
Update Roslyn to 2.8.0-beta4-62824-10
 2018-04-24 16:57:11 -07:00
Livar
a711c264f1
Update Roslyn to 2.8.0-beta4-62824-10 2018-04-24 16:00:33 -07:00
John Beisner
c115d048f7 Merged PR 118577: Refresh release/2.1.2xx-MSRC with 'dotnet' release/2.1.2xx 
Pulling in: https://github.com/dotnet/cli/pull/9096 and other updates to release/2.1.2xx

Please review DependencyVersions.props
 2018-04-24 18:12:28 +00:00
jbeisner
36d7cdf8c1 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-24 17:51:56 +00:00
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
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
7f0abdbf3e
Merge pull request #9096 from natemcmaster/installer-fix 
Fix .deb and .rpm dependency on the aspnetcore-store package
 2018-04-19 16:46:41 -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
Nate McMaster
2d008aa4f7
Add tests that assert the dependencies of the dotnet-sdk rpm and deb files 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
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
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
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