Commit graph

919 commits

Author SHA1 Message Date
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
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
Wes Haggard
1e30cf3b5f Add temporary feed to boot-strap linux-musl build 2018-04-20 14:11:06 -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
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
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
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
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
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
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
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
4c948fefcc
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-05 09:09:45 -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
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
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
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
Daniel Plaisted
42e45e13a7 Update Microsoft.NET.Sdk package 2018-03-30 14:38:39 -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
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
80eb07bb0d MSBuild 15.7.127.34537 2018-03-27 18:36:20 -05:00
Pranav K
52b2e4c733
Update AspNetCore version to 2.1.0-preview2-30475 2018-03-27 09:28:10 -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
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
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
Brice Lambson
efa717daaa Bundle dotnet-ef 2018-03-23 13:18:07 -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
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
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