Commit graph

1238 commits

Author SHA1 Message Date
Livar Cunha
33c3a26880 Updating asp.net to 2.2.0 as well. 2018-06-01 13:31:03 -07:00
Daniel Plaisted
c9d457a6b9
Merge pull request #9350 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-31 20:09:06 -07:00
Livar Cunha
2f0f270a73 Updating the build and tests to work with the 2.2.0 runtime. 2018-05-31 19:14:24 -07:00
Nate McMaster
276045d957
Set package versions for bundled aspnet tools separately from the metapackage version 2018-05-31 12:39:56 -07:00
Nick Guerrera
81c7f9a3e9
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-05-31 11:59:29 -07:00
Nate McMaster
a997650cb4
Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable 2018-05-31 11:54:12 -07:00
Nate McMaster
538aa557b0
Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change 2018-05-31 10:34:02 -07:00
Andy Gerlicher
29def94d78 MSBuild 15.8.78 2018-05-30 19:59:32 -07:00
Livar Cunha
aeae506fa8 Updating dependency versions to match prodcon. 2018-05-25 12:11:39 -07:00
Daniel Plaisted
d17b088022 Insert updated SDK from 2.1.4xx branch 2018-05-24 16:29:10 -07:00
Rainer Sigwald
48eab9c572 MSBuild 15.8.60 2018-05-24 12:05:52 -05:00
Andy Gerlicher
5e794a064c Add reference to Microsoft.Build.NuGetSdkResolver 2018-05-21 15:29:37 -07:00
Andy Gerlicher
6bed6e1943 MSBuild 15.8.61 2018-05-21 15:29:37 -07:00
Livar
7adbeb3928
Merge pull request #9259 from dotnet/nuget.client.release-4.8.0.5196-1-1
Insert NuGet Build 4.8.0-preview1.5196 into cli
2018-05-19 08:59:59 -07:00
Livar
a45bba7eb9
Merge pull request #9308 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 15:17:08 -07:00
Livar
d57435bfcd
Merge pull request #9305 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 11:53:21 -07:00
Livar
8829b9690e
Maintain MSBuild version at 15.7.179 2018-05-17 11:51:36 -07:00
Livar
ded465c666
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-05-17 10:37:00 -07:00
John Beisner
d7892663ea
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-05-16 14:50:13 -07:00
Jared Parsons
4d3b649efc
Fix version number 2018-05-16 11:04:16 -07:00
John Beisner
b78d591c97
Merge pull request #9284 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-16 09:04:53 -07:00
dotnet-maestro-bot
be606951b1 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, roslyn, sdk, templating, templating, templating, websdk to rtm-62915-03, rtm-62915-03, rtm-26515-03, rtm-26515-03, rtm-26515-03, rtm-180515-0, 15.7.177, beta6-62915-07, rtm-62915-10, beta3-20180515-1688254, beta3-20180515-1688254, beta3-20180515-1688254, rtm-20180515-1688249, respectively 2018-05-15 23:49:42 +00:00
Jared Parsons
4e6171401c
Consume 15.7.2 compiler 2018-05-15 12:51:40 -07:00
John Beisner
08b20ef268
Merge pull request #9275 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-15 09:17:36 -07:00
Livar
f55724c348
Merge pull request #9276 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62914-01, rtm-62914-02, rtm-26514-02, rtm-26514-02, rtm-26514-02, rtm-180513-0, beta6-62911-06, rtm-62914-01, beta3-20180513-1683966, beta3-20180513-1683966, beta3-20180513-1683966, rtm-20180513-1683962, respectively (release/2.1.3xx)
2018-05-14 21:25:46 -07:00
Livar
8096889442
Merge pull request #9262 from rainersigwald/msbuild-15.7.179-3xx
MSBuild 15.7.179
2018-05-14 09:47:06 -07:00
dotnet-maestro-bot
1fd2a6aa90 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62914-01, rtm-62914-02, rtm-26514-02, rtm-26514-02, rtm-26514-02, rtm-180513-0, beta6-62911-06, rtm-62914-01, beta3-20180513-1683966, beta3-20180513-1683966, beta3-20180513-1683966, rtm-20180513-1683962, respectively 2018-05-14 15:46:02 +00:00
Rainer Sigwald
85aba00741 MSBuild 15.7.179 2018-05-11 13:30:58 -05:00
Rainer Sigwald
98fa02ade4 MSBuild 15.7.179 2018-05-11 13:15:30 -05:00
NuGet Team Bot
f6be1b1669 Insert NuGet Build 4.8.0-preview1.5196 into cli 2018-05-11 10:36:28 -07:00
Livar
11f2843f7b
Merge pull request #9252 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-11 10:16:04 -07:00
abhishkk
b18efcea85 15.8.0-preview-20180510-03 testplatform insertion 2018-05-11 16:11:54 +05:30
Livar
4919ee2484
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-05-09 15:42:26 -07:00
John Beisner
da7da0b018
Merge pull request #9227 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-09 14:06:02 -07:00
Parallels
3bbab5edbf Updating tests to depend on -upgrade packages and also updating the versions of the runtime and asp.net to versions that have support for upgradable linux packages. 2018-05-08 18:11:54 -07:00
dotnet-maestro-bot
1a8ba89a7f Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, sdk, templating, templating, templating, websdk to rtm-62908-03, alpha-62908-03, rtm-26508-02, rtm-26508-02, rtm-26508-02, rtm-180508-0, rtm-62908-02, beta3-20180508-1667431, beta3-20180508-1667431, beta3-20180508-1667431, rtm-20180508-1667423, respectively 2018-05-09 00:31:48 +00:00
Tanner Gooding
6d6bf64f28 Merge remote-tracking branch 'dotnet/release/2.1.3xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-05-07 08:20:23 -07:00
dotnet-maestro-bot
a2f3fb835d Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62905-02, alpha-62905-02, rtm-26505-04, rtm-26505-04, rtm-26505-04, rtm-180505-0, beta6-62904-04, rtm-62905-02, beta3-20180505-1661716, beta3-20180505-1661716, beta3-20180505-1661716, rtm-20180505-1661707, respectively 2018-05-05 20:42:19 +00:00
NuGet Team Bot
817870e977 Insert NuGet Build 4.8.0-preview1.5158 into cli 2018-05-04 10:58:07 -07:00
Tanner Gooding
a8856ddccc Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-05-03 15:24:39 -07:00
Livar
b1b35e4226
Update SDK to latest from 2.1.300
Updating to 1.0.0-rc1-62827-06. There is a bug in the SDK where we are producing packages with the wrong version.
2018-04-27 16:33:52 -07:00
jbeisner
6fcea14b78 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-27 22:05:24 +00:00
Livar
70994ee6dd
Update SDK to 2.1.200-preview-62827-05 2018-04-27 14:06:19 -07:00
dotnet-maestro-bot
4009912a6e Update clicommandlineparser, climigrate, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to alpha-62823-01, alpha-62823-01, rc1-26423-06, rc1-26423-06, rtm-180422-0, beta4-62827-02, rc1-62823-01, beta3-20180422-1618305, beta3-20180422-1618305, beta3-20180422-1618305, rc1-20180422-1618307, respectively 2018-04-27 15:48:19 +00:00
jbeisner
55535c0f41 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-26 22:51:04 +00:00
Livar
fc577e6b05
Update SDK to 2.1.200-preview-62826-08 2018-04-26 14:12:42 -07:00
Livar
20574d2e7b
Merge pull request #9147 from AndyGerlicher/MSBuild-15.7.177-2xx
MSBuild 15.7.177 (2xx)
2018-04-26 13:21:31 -07:00
Livar
af62bffb45
Merge pull request #9133 from dotnet/nuget.client.release-5148-1-1
Insert NuGet Build 4.7.0-rtm.5148 into cli
2018-04-26 13:21:04 -07:00
Andy Gerlicher
a4cc9fa5e0 MSBuild 15.7.177 2018-04-25 20:39:14 -07:00
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
a711c264f1
Update Roslyn to 2.8.0-beta4-62824-10 2018-04-24 16:00:33 -07:00
NuGet Team Bot
458ad92d49 Insert NuGet Build 4.7.0-rtm.5148 into cli 2018-04-24 14:50:13 -07:00
jbeisner
247937665f Fix a release/2.1.3xx baseline error:
error NU1605: Detected package downgrade: Microsoft.NETCore.App from 2.1.0-rc1-26423-06 to 2.1.0-rc1-26420-08
2018-04-24 20:57:42 +00:00
John Beisner
754a68524a
Merge branch 'release/2.1.3xx' into FixLinuxMusl 2018-04-24 13:31:46 -07:00
jbeisner
70e3f1d30d Updating the AspNetCore version to a drop that has a 'linux-musl' asset 2018-04-24 19:51:04 +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
0b885eee23
Update to ASP.NET Core 2.0.8 build 10026 2018-04-23 20:02:08 -07:00
John Luo
441a470f54 Add bundled aspnetcore runtime framework versions
- Add integration test for implicit Microsoft.AspNetCore.App versions
2018-04-23 00:33:33 -07: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
Wes Haggard
1e30cf3b5f Add temporary feed to boot-strap linux-musl build 2018-04-20 14:11:06 -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
dotnet-maestro-bot
8317c6f0da Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, nugetclient, roslyn, sdk, templating, templating, templating, websdk to alpha-62819-01, alpha-62819-01, rc1-26419-02, rc1-26419-02, rc1-26419-02, rtm-180418-0, preview-000169, preview1.5116, dev-62819-05, preview3-62819-01, beta3-20180418-1607235, beta3-20180418-1607235, beta3-20180418-1607235, rc1-20180418-1607241, respectively 2018-04-19 19:40:52 +00: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
Daniel Plaisted
c01e4f07b8
Merge pull request #9053 from dsplaisted/update-nuget
Insert NuGet Build 4.7.0-rtm.5081 into cli
2018-04-11 16:48:20 -07:00
NuGet Team Bot
a86d529687 Insert NuGet Build 4.7.0-rtm.5081 into cli 2018-04-11 13:58:39 -07:00
Livar
7cd9176ac0
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-11 12:05:59 -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
dotnet-maestro-bot
98e8857f1f Update coresetup, coresetup, coresetup, roslyn to preview3-26411-06, preview3-26411-06, preview3-26411-06, beta4-62811-05, respectively 2018-04-11 17:46:24 +00:00
John Beisner
11eace08b9
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-11 09:30:34 -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
dotnet-maestro-bot
1135ea6869 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, roslyn, sdk, templating, templating, templating, websdk to alpha-62806-05, alpha-62806-04, preview2-26406-04, preview2-26406-04, preview2-26406-04, rtm-180406-0, preview-000145, beta4-62806-08, preview2-62806-04, beta3-20180406-1563557, beta3-20180406-1563557, beta3-20180406-1563557, preview2-20180406-1563552, respectively 2018-04-09 20:17:41 +00:00
Nate McMaster
1860d43323
Update to ASP.NET Core 2.0.7 build 231 2018-04-09 12:14:47 -07:00
Eric Erhardt
fbd5154ba4 Fix merge to only update core-setup and Roslyn versions. 2018-04-09 10:40:14 -05:00
Eric Erhardt
47bda58a23
Merge branch 'master' into master-UpdateDependencies 2018-04-09 10:30:10 -05:00
Mike Lorbetske
8370f24850 Update test templates to use the 15.7.0 test SDK 2018-04-08 11:57:30 -07:00
dotnet-maestro-bot
936cc73ef2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26406-06, preview3-26406-06, preview3-26406-06, beta4-62806-08, respectively 2018-04-06 17:53:37 +00:00
Kevin Ransom
8fa1c8230b Align dotnetcli with VS2017.4 compiler 2018-04-06 10:52:34 -07:00
Livar
7cb7535bae
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-06 09:05:57 -07:00
Eric Erhardt
a6cf823b9c
Merge pull request #9000 from dotnet-maestro-bot/master-UpdateDependencies
Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26405-02, preview3-26405-02, preview3-26405-02, beta4-62805-01, respectively (master)
2018-04-06 09:18:59 -05:00
Nick Guerrera
4956bfea8c
Merge pull request #8996 from nguerrera/publish-no-build
Implement `dotnet publish --no-build`
2018-04-05 23:43:02 -07:00
Livar
d8eed7963e
Merge branch 'master' into master-UpdateDependencies 2018-04-05 15:32:36 -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
dotnet-maestro-bot
921c3849e2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26405-02, preview3-26405-02, preview3-26405-02, beta4-62805-01, respectively 2018-04-05 17:40:43 +00: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
4c948fefcc
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-05 09:09:45 -07:00
Livar Cunha
364ee996bf Fixing another typo in that is breaking RHEL. 2018-04-04 22:43:37 -07:00
Nick Guerrera
b6174af511 Implement dotnet publish --no-build 2018-04-04 15:03:29 -07:00
dotnet-maestro-bot
69c380765c Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, nugetclient, roslyn, sdk, templating, templating, templating, websdk to alpha-62803-03, alpha-62803-04, preview2-26403-06, preview2-26403-06, preview2-26403-06, rtm-180403-0, preview-000144, preview4.5065, beta4-62803-03, preview2-62803-07, beta3-20180403-1549505, beta3-20180403-1549505, beta3-20180403-1549505, preview2-20180403-1549509, respectively 2018-04-04 21:31:25 +00:00
dotnet-maestro-bot
ffc1d286a1 Update Roslyn to beta4-62804-05 2018-04-04 19:47:16 +00:00
Livar
334ac4f4f3
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-04-04 10:18:12 -07:00
Livar
a7bfaacf99
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-04 10:16:22 -07:00
Mayank Bansal
674f64c4c7 Insert Testplatform 15.7 RTM package in dotnet SDK 2018-04-04 14:08:12 +05:30
dotnet-maestro-bot
bcbfd02312 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26404-01, preview3-26404-01, preview3-26404-01, beta4-62802-07, respectively 2018-04-04 05:31:27 +00:00
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
William Li
e70f07178a
Apphost shim (#8893)
* Publish app host to folder under SDK

* Use carried apphost as shim

* Remove full framework launcher

* Fix test run command issue

* Use latest release/2.1 build

* Test with 32 bit env

* Add missing return

* Update to latest prodcon build

* Add xlfs
2018-04-02 12:37:25 -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 Cunha
c9059f20be Updated SDK version to 2.1.300-preview2-62731-04. 2018-03-31 21:08:32 -07:00
dotnet-maestro-bot
ea773d6321 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, roslyn, sdk, templating, templating, templating, websdk to alpha-62730-03, alpha-62730-04, preview2-26330-03, preview2-26330-03, preview2-26330-03, rtm-180330-0, preview-000143, beta4-62730-07, preview2-62730-09, beta3-20180330-1538568, beta3-20180330-1538568, beta3-20180330-1538568, preview2-20180330-1538569, respectively 2018-03-31 18:45:57 +00: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
Daniel Plaisted
42e45e13a7 Update Microsoft.NET.Sdk package 2018-03-30 14:38:39 -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
Matt Mitchell
19267bd9f1 Remove unused Dia package
Extend CLI dependency updating
Extend CLI's dependency updating to include all repos.  At this time, only ASPNet won't work with this, as in prodcon it isn't specifying a branch in the manifest, which means no Latest_Packages.txt gets set.  Once this is fixed all upstream repos in CLI should be handled.
This will be combined with changes to the versions repo to update the subscriptions for 2.1.3xx CLI.
2018-03-29 15:58:33 -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
6c3a714b5d
Merge pull request #8852 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-03-28 10:26:17 -07:00
Livar
f72e6926ca
Merge pull request #8897 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-28 10:11:24 -07:00
Livar
ae08395451
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-03-27 16:45:20 -07:00
Rainer Sigwald
56a01638e1 MSBuild 15.7.127.34537 2018-03-27 18:38:03 -05:00
Rainer Sigwald
80eb07bb0d MSBuild 15.7.127.34537 2018-03-27 18:36:20 -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
Pranav K
52b2e4c733
Update AspNetCore version to 2.1.0-preview2-30475 2018-03-27 09:28: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
Livar
b5a163c7c1
Merge pull request #8884 from rainersigwald/AndyGerlicher-MSBuild-15.7.108
MSBuild 15.7.124 for 2.1.3xx
2018-03-25 19:14:20 -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
NuGet Team Bot
fbacb9cd4b Insert NuGet Build 4.7.0-preview3.5039 into cli 2018-03-24 21:33:53 -07:00
Andy Gerlicher
78c3211cc6 MSBuild 15.7.124-preview 2018-03-24 21:19:34 -07:00
Andy Gerlicher
cd646d2dbc MSBuild 15.7.122-preview 2018-03-24 18:51:49 -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
Peter Huene
112926727a
Merge branch 'release/2.1.3xx' into master
* upstream/release/2.1.3xx:
  Try shorter test names
  Fix project type GUIDs when adding projects to solution files.
  Updating the runtime to 2.1.0-preview2-26314-02
  Remove runtime identifiers from the test project
  Update launch settings for ApplicationUrl handling
  Change command order for tools (#8862)
  Update translations following merge with conflicts.
  LOC CHECKIN | cli master | 20180315
  Implement the --tool-path option for the list tool command.
  Ensure tool package store root is a full path.
  Better using facing string (#8809)
  Fix list tool command tests to be localizable.
  Fix #4139 - escape quoted strings for process start
  Generate Microsoft.NETCoreSdk.BundledCliTools.props
2018-03-23 15:17:35 -07:00
NuGet Team Bot
e49fab7143 Insert NuGet Build 4.7.0-preview3.5039 into cli 2018-03-23 14:17:25 -07:00
Brice Lambson
efa717daaa Bundle dotnet-ef 2018-03-23 13:18:07 -07:00
Livar Cunha
0d22280e08 Update msbuild to 15.7.0-preview-000122 2018-03-23 12:25:16 -07:00
Livar
fdac4bcbb9
Update Roslyn to 2.8.0-beta3-62722-05 2018-03-23 12:16:12 -07:00
Livar
52c73a1e26
Updating the runtime to 2.1.0-preview2-26314-02 2018-03-22 17:16:55 -07:00
Livar
6b15f121f5
Update Roslyn to 2.8.0-beta3-62722-05 2018-03-22 16:21:37 -07:00
Andy Gerlicher
c4cae059a9 MSBuild 15.7.108
* Add feed to msbuild myget
* Update MSBuild to 15.7.108 (contains both netcoreapp2.0 and
netcoreapp2.1)
2018-03-22 16:08:18 -07:00
Peter Huene
4c516bc299
Merge 'release/2.1.2xx' into release/2.1.3xx
* upstream/release/2.1.2xx: (31 commits)
  Update SDK to 2.1.100-preview-62721-01
  Updating the branding of the CLI to 2.1.103.
  Updating NuGet to 4.6.1-rtm-5019
  Update SDK to 2.1.200-preview-62717-01
  Updating the SDK to 2.1.200-preview-62716-06.
  Updating the SDK to 2.1.200-preview-62716-04
  Update SDK to 2.1.200-preview-62715-08
  Updating Roslyn to 2.8.0-beta2-62713-11
  Updating the SDK version to 2.1.100-preview-62714-01
  Updating the branding of the CLI to 2.1.102.
  Remove cli-deps from sources.
  Update Roslyn to 2.7.0-beta3-62707-11
  add nuget-build myget feed as source
  Insert NuGet Build 4.7.0-preview1.4982 into cli
  Update to the 15.6 RTM version of the test SDK in templates
  Update to consume aspnetcore 2.0.6-10011
  Updating TestPlatform to 15.6 RTM
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  ...
2018-03-22 13:01:24 -07:00
Mayank Bansal
bedf79f444 [WIP]TestPlatform 15.7 preview 3 insertion 2018-03-22 14:25:38 +05:30
Livar
9b0e592e30
Update SDK to 2.1.100-preview-62721-01 2018-03-20 23:33:21 -07:00
Livar Cunha
f557859feb Updating NuGet to 4.6.1-rtm-5019 2018-03-20 14:22:54 -07:00
Livar
bca991fddb
Update SDK to 2.1.200-preview-62717-01 2018-03-16 17:57:25 -07:00
Livar
e2c3f7e3d4
Updating the SDK to 2.1.200-preview-62716-06. 2018-03-16 13:32:07 -07:00
Livar
005f87257a
Merge pull request #8810 from dotnet/prkrishn/update-versions
Update AspNetCore package versions to 2.1.0-preview2-30338
2018-03-16 10:41:15 -07:00
Livar
eeca22fc71
Updating the SDK to 2.1.200-preview-62716-04 2018-03-15 21:23:22 -07:00
Nick Guerrera
fb093499f0
Update dotnet/sdk to latest
Includes fast ResolvePackageAssets
2018-03-15 18:37:39 -07:00
William Lee
3d13658f97 Update SDK to2.1.300-preview2-62715-07 (#8808) 2018-03-15 18:36:48 -07:00
Livar
b0acac94b8
Update SDK to 2.1.200-preview-62715-08 2018-03-15 17:08:38 -07:00
Pranav K
d5894edefa
Update AspNetCore package versions to 2.1.0-preview2-30338 2018-03-15 16:20:14 -07:00
Livar
680e72993b
Merge pull request #8795 from natemcmaster/aspnetcore-alpine
Upgrade to aspnetcore 2.1.0-preview2-30331 and pull aspnetcore for Alpine Linux
2018-03-15 14:23:20 -07:00
John Beisner
2a63f9e76c
Merge pull request #8788 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-15 13:15:51 -07:00
Nate McMaster
c257087ca6 Upgrade to aspnetcore 2.1.0-preview2-30331 and pull aspnetcore for Alpine Linux 2018-03-14 16:47:59 -07:00
Livar
8fd0e7317d
Updating Roslyn to 2.8.0-beta2-62713-11 2018-03-13 20:26:51 -07:00
Livar Cunha
b87e9521cd Merge branch 'release/2.1.1xx' into merge_release_211xx_into_release_212xx
* release/2.1.1xx: (21 commits)
  Updating the SDK version to 2.1.100-preview-62714-01
  Updating the branding of the CLI to 2.1.102.
  Remove cli-deps from sources.
  Update Roslyn to 2.7.0-beta3-62707-11
  Update to the 15.6 RTM version of the test SDK in templates
  Update to consume aspnetcore 2.0.6-10011
  Updating TestPlatform to 15.6 RTM
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  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.
  ...

 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-03-13 20:23:33 -07:00
Livar
8d409357db
Merge pull request #8785 from dotnet/update_sdk
Updating the SDK version to 2.1.100-preview-62714-01
2018-03-13 20:16:10 -07:00
Livar
a662fda7aa
Merge pull request #8783 from dotnet/update_roslyn
Update Roslyn to 2.7.0-beta3-62707-11
2018-03-13 18:10:10 -07:00
Livar
2e7d92be25
Updating the SDK version to 2.1.100-preview-62714-01 2018-03-13 18:09:31 -07:00
Peter Huene
8444cb04b5
Merge pull request #8781 from peterhuene/msrc-merge
Merge release/2.1.1xx-MSRC to release/2.1.1xx
2018-03-13 17:34:13 -07:00
Livar
b197f75b45
Update Roslyn to 2.7.0-beta3-62707-11 2018-03-13 16:42:22 -07:00
Livar
fa5b011266
Merge pull request #8693 from mlorbetske/dev/mlorbe/UpdateTestTemplatesFor156
Update to the 15.6 RTM version of the test SDK in templates
2018-03-13 16:31:35 -07:00
Livar
e606c10013
Merge pull request #8630 from jayaranigarg/tpv2rtm15.6
Branding changes for  TestPlatform 15.6 RTM
2018-03-13 16:31:08 -07:00
Livar
3ebe4e552b
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-03-13 12:33:39 -07:00
dotnet-bot
70f2b13256 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26313-01, preview2-26313-01, preview2-26313-01, beta2-62713-01, respectively 2018-03-13 05:39:24 +00:00
NuGet Team Bot
90eed38b2d Insert NuGet Build 4.7.0-preview1.4982 into cli 2018-03-12 15:48:04 -07:00
dotnet-bot
6ec1bb93ab Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26311-02, preview2-26311-02, preview2-26311-02, beta2-62711-03, respectively 2018-03-11 18:06:08 +00:00
Nate McMaster
ab4aa487e2
Update to aspnetcore 2.1.0-preview2-30281 2018-03-09 10:05:56 -08:00
dotnet-bot
23e8e34bb2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26309-01, preview2-26309-01, preview2-26309-01, beta2-62708-11, respectively 2018-03-09 07:07:20 +00:00
Livar
f29118002c
Merge pull request #8730 from AndyGerlicher/MSBuild.15.6.66
MSBuild 15.7.66
2018-03-08 10:50:17 -08:00
dotnet bot
af526542a2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26308-01, preview2-26308-01, preview2-26308-01, beta2-62708-04, respectively (#8742) 2018-03-08 09:18:05 -08:00
dotnet bot
2e7c5f123a Update CoreSetup to preview2-26306-04 (master) (#8731) 2018-03-07 19:23:05 -08:00
Pranav K
1d38617765
Update AspNetCore and WebSdk versions 2018-03-06 14:25:44 -08:00
Andy Gerlicher
9178360c54 MSBuild 15.7.66 2018-03-06 10:05:22 -08:00
Eric Erhardt
3d1caf1d63
Revert Roslyn update
In order to isolate the changes to find the break.
2018-03-06 09:23:25 -06:00
dotnet-bot
a4eaae7155 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26306-03, preview2-26306-03, preview2-26306-03, beta1-62628-07, respectively 2018-03-06 10:11:12 +00:00
Livar
7a733ffd0e
Merge pull request #8708 from mlorbetske/dev/mlorbe/Update21TestTemplatesTo157
Update 2.1 test templates to use the 15.7 preview 1 test SDK
2018-03-05 11:39:35 -08:00
Livar
68922e2a51
Merge pull request #8657 from dotnet/vramak/WebSdk_Update_2212018
Updating the WebSdk version to 2.1.300-preview2-20180221-1406058
2018-03-02 15:39:19 -08:00
Livar
b84eb1081b
Merge pull request #8702 from dotnet/johluo/update-dotnet-archive
Update Microsoft.DotNet.Archive version
2018-03-01 15:02:50 -08:00
Livar
28223a0caf
Merge pull request #8701 from dotnet/livarcocc-patch-1
Update SDK to 2.1.300-preview2-62628-06
2018-02-28 20:40:33 -08:00
Mike Lorbetske
030b6b406c Update 2.1 test templates to use the 15.7 preview 1 test SDK 2018-02-28 14:51:05 -08:00
Mike Lorbetske
d05a751e59 Update 2.0 test templates for the 15.7 test SDK 2018-02-28 14:43:18 -08:00
danmosemsft
4c36ae18f4 Latest versions 2018-02-28 14:08:35 -08:00
John Luo
309be9c10d Update Microsoft.DotNet.Archive version 2018-02-28 12:19:27 -08:00
danmosemsft
3965ce7047 Updated core-setup 2018-02-28 11:00:10 -08:00
danmosemsft
8a6a642d66 01 2018-02-28 11:00:09 -08:00
danmosemsft
d00060d449 Use core-setup version 2018-02-28 11:00:08 -08:00
Dan Moseley
6c0944a017 Update again 2018-02-28 11:00:08 -08:00
Dan Moseley
99b55ce247 Update to latest CoreFX manually 2018-02-28 11:00:07 -08:00
danmosemsft
b3a14f1ec9 Merge with master 2018-02-28 11:00:07 -08:00
dotnet-bot
bcbbf6634f Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26219-02, preview2-26219-02, preview2-26219-02, beta1-62616-10, respectively 2018-02-28 11:00:06 -08:00
Livar
a631900fa7
Update SDK to 2.1.300-preview2-62628-06
Carries the fix for the preview message.
2018-02-28 10:35:05 -08:00
Jeff Kluge
6944a40878
MSBuild 15.7.63 (#8696)
* Update package version to 15.7.0-preview-000063
* Add dotnet.myget.org msbuild feed
2018-02-27 17:53:54 -08: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
Livar
59746d409c
Merge branch 'master' into vramak/WebSdk_Update_2212018 2018-02-27 10:48:43 -08:00
Livar
6b2d44ba5f
Merge pull request #8684 from abhishkk/testPlatformInsertion
TestPlatform 15.7 preview insertion
2018-02-26 10:44:45 -08:00
abhishk
6ea849b7ef TestPlatform 15.7 preview insertion 2018-02-26 11:36:25 +05:30
Livar Cunha
abec8bb31e Updating the version of ASP.NET 2018-02-23 15:00:25 -08:00
Tanner Gooding
eadc1d3703 Updating the toolset version to 2.0.3-refac-007111 2018-02-23 14:03:07 -08:00
Pranav K
d5169549fc
Also update Microsoft.AspNetCore.App 2018-02-22 10:03:32 -08:00
Pranav K
c210f7c360 Update Razor Sdk version to 2.1.0-preview2-30169 2018-02-22 07:10:45 -08:00
Nick Guerrera
47ded461b6
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-02-21 15:58:55 -08:00
vramak
60651922bb Update the WebSdk Version to 2.0.0-rel-20180221-676 2018-02-21 14:16:54 -08:00
vramak
47d0d07fb8 Updating the WebSdk version to 2.1.300-preview2-20180221-1406058 2018-02-21 11:27:58 -08:00
John Luo
9c6da08d66
Update to consume aspnetcore 2.0.6-10011 2018-02-20 16:53:38 -08:00
Nick Guerrera
481a8146e2
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-02-20 16:10:04 -08:00
Nick Guerrera
618650adec
Merge pull request #8641 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-02-20 16:06:43 -08:00
Nick Guerrera
7ba0ded366
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-02-20 16:04:32 -08: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
51469d6253
Update SDK to 2.1.100-preview-62617-01 2018-02-16 21:13:41 -08:00
Pranav K
1e9f85d35a Update versions of Web and Razor Sdk 2018-02-16 18:06:47 -08:00
NuGet Team Bot
29ce191177 Insert NuGet Build 4.7.0-preview1-4927 into cli 2018-02-16 14:13:05 -08:00
Livar
6023fa4506
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-02-16 09:31:09 -08:00
jagarg
c618b6fcbb Updating TestPlatform to 15.6 RTM 2018-02-16 18:44:31 +05:30
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
4810eff390 Update ASP.NET version to 2.1.0-preview2-30106 2018-02-15 12:23:35 -08:00
Livar Cunha
f19b3fddc9 Merge remote-tracking branch 'dotnet/release/2.1.3xx' into merges/release/2.1.3xx-to-master
* dotnet/release/2.1.3xx:
  Update to aspnetcore 2.1.0-preview1-28275 and react to feed layout changes (#8611)
  "ExternalRestoreSources" needs to be set in the docker container (#8602)
  Signing nupkg contents (Cli.Utils and MSBuildResolver) along with the rest of the compiled assemblies.
  Use satellites from roslyn package, not cli-deps-satellites
  Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
  Support TildeSlash expand (#8589)
  Port Kernel Version telemetry to preview1
  Do not create a directory with a trailing space; it cannot be deleted by conventional methods. (#8587)
  Consume generic aspnetcore rpm installers
  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
  Update SDK to 2.1.300-preview1-62608-07
  MSBuild 15.6.80

 Conflicts:
	build/DependencyVersions.props
	test/Microsoft.DotNet.ShellShim.Tests/ShellShimMakerTests.cs
2018-02-15 11:57:36 -08:00
Livar
58ae49cb90
Merge branch 'release/2.1.1xx' into UpdateFSharpCompiler 2018-02-15 11:21:20 -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
99fc344435
Merge branch 'release/2.1.1xx' into UpdateFSharp 2018-02-14 15:20:45 -08:00
Livar Cunha
7e32b9a593 Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx
* dotnet/release/2.1.2xx:
  Use satellites from roslyn package, not cli-deps-satellites
  Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
2018-02-14 15:18:29 -08:00
Andy Gerlicher
bbd1b50a17 MSBuild 15.6.82 2018-02-14 15:09:12 -08:00
Pranav K
9bf75f06fb Update Sdk versions 2018-02-14 13:42:47 -08: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
Nate McMaster
62ce305f06 Update to aspnetcore 2.1.0-preview1-28275 and react to feed layout changes (#8611) 2018-02-14 11:50:14 -08:00
Livar
73963e8018
Merge pull request #8608 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-02-14 10:08:15 -08:00
Peter Huene
32eeb5ddd5
Updating runtime to 2.0.6. 2018-02-13 18:54:35 -08:00
Pranav K
3547a1227c Update AspNetCore version 2018-02-13 17:54:33 -08: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
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
Livar
44229ea013
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-02-13 13:51:17 -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