Commit graph

1269 commits

Author SHA1 Message Date
Nick Guerrera
d23a4955a7 Insert latest toolset 2018-10-17 16:36:48 -07:00
Nick Guerrera
70c419596c Insert latest Microsoft.DesktopUI.App 2018-10-17 14:31:36 -07:00
dotnet-maestro-bot
1ae7be4c02 Update coresetup to preview1-27017-04 2018-10-17 17:39:27 +00:00
dotnet-maestro-bot
aac04c5389 Update coresetup to preview1-27016-04 2018-10-16 17:36:39 +00:00
dotnet-maestro-bot
e3f03bebaa Update coresetup to preview1-27013-04 2018-10-13 17:37:14 +00:00
Daniel Plaisted
df2aaf07e5 Insert updated toolset 2018-10-11 15:33:06 -07:00
dotnet-maestro-bot
51ce292696 Update coresetup to preview1-27009-01 2018-10-09 05:42:27 +00:00
Daniel Plaisted
eeb7410b19 Insert updated DesktopUI 2018-10-08 11:58:17 -07:00
dotnet-maestro-bot
a820fac0bc Update coresetup to preview1-27004-04 2018-10-04 17:41:45 +00:00
dotnet-maestro-bot
a646382bb9 Update coresetup to preview1-27003-04 2018-10-03 17:40:43 +00:00
Livar
cb3f8f3e3c
Merge pull request #98 from dotnet/add_3_0_templates
Adding netcoreapp3.0 templates for console apps.
2018-10-02 13:20:15 -07:00
Livar Cunha
56d2ba9810 Adding netcoreapp3.0 templates for console apps. 2018-10-02 11:21:50 -07:00
dotnet-maestro-bot
cec9fabfe4 Update coresetup to preview1-27002-01 2018-10-02 05:39:01 +00:00
dotnet-maestro-bot
a907b822f1 Update coresetup to preview1-26928-03 2018-09-28 17:45:21 +00:00
dotnet-maestro-bot
065ef0b42b Update coresetup to preview1-26928-01 2018-09-28 05:52:29 +00:00
dotnet-maestro-bot
e2dcc4914b Update coresetup to preview1-26927-03 2018-09-27 17:40:53 +00:00
dotnet-maestro-bot
6b67aa1e0a Update coresetup to preview1-26927-01 2018-09-27 05:57:47 +00:00
Daniel Plaisted
34bcad8117 Insert updated DesktopUI 2018-09-24 13:32:54 -07:00
dotnet-maestro-bot
6c68a50522 Update coresetup to preview1-26924-01 2018-09-24 05:39:56 +00:00
dotnet-maestro-bot
a4aa95bf9a Update coresetup to preview1-26921-03 2018-09-21 17:42:48 +00:00
dotnet-maestro-bot
e4c136e2ff Update coresetup to preview1-26919-02 2018-09-19 05:40:21 +00:00
dotnet-maestro-bot
3ea40b660a Update coresetup to preview1-26918-01 2018-09-18 05:47:01 +00:00
Livar
d7693b2f5f
Merge pull request #73 from wli3/merge-release/2.2.1xx
Merge release/2.2.1xx
2018-09-17 16:32:22 -07:00
Livar
ab1747e61e
Merge pull request #80 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup to preview1-26917-04 (master)
2018-09-17 16:32:04 -07:00
dotnet-maestro-bot
de8fd78458 Update coresetup to preview1-26917-04 2018-09-17 17:32:35 +00:00
Livar
82620fe939
Updating toolset to 3.0.100-alpha1-009517 2018-09-16 12:04:28 -07:00
Livar
1739bd8ca4
Merge branch 'master' into merge-release/2.2.1xx 2018-09-16 12:03:31 -07:00
dotnet-maestro-bot
3e3ca14839 Update coresetup to preview1-26913-02 2018-09-13 17:34:13 +00:00
William Li
97817b0ca2 Fix merge 2018-09-09 21:16:16 -07:00
William Li
f3c7f5ed78 Merge remote-tracking branch 'oldcli/release/2.2.1xx' into merge-release/2.2.1xx 2018-09-09 20:42:17 -07:00
dotnet-maestro-bot
7021c4f5b4 Update coresetup to preview1-26909-04 2018-09-09 17:32:54 +00:00
dotnet-maestro-bot
9873731c2c Update coresetup to preview1-26907-05 2018-09-07 18:22:37 +00:00
Matt Mitchell
0408e13bc3 Update AspnetCore.All instead of AspnetCore.App 2018-09-05 09:07:44 -07:00
Daniel Plaisted
92e66541e5 Insert updated toolset 2018-09-05 07:12:26 -07:00
Daniel Plaisted
d519f30898
Merge pull request #70 from dsplaisted/winforms-templates
Add WinForms project templates, insert updated DesktopUI
2018-08-29 14:49:37 -07:00
Daniel Plaisted
4e617e6ce1 Add WinForms project templates, insert updated DesktopUI 2018-08-29 13:12:43 -07:00
dotnet-maestro-bot
9d1cc32bed Update coresetup to preview1-26829-01 2018-08-29 05:36:40 +00:00
Daniel Plaisted
1c8984ee75 Use prodcon-friendly property names for WPF package versions 2018-08-28 14:58:20 -07:00
Daniel Plaisted
997bd7b0e6 Include WPF project templates, insert toolset with updated WPF SDK, insert updated WPF 2018-08-28 12:30:11 -07:00
dotnet-maestro-bot
b0de5acdb6 Update coresetup to preview1-26828-01 2018-08-28 05:36:48 +00:00
Livar Cunha
40172615ba Changing the property names for 2.2 templates to be named 22 instead of 20. 2018-08-27 15:53:35 -07:00
dotnet-maestro-bot
7a48e077b9 Update coresetup to preview1-26827-01 2018-08-27 05:33:25 +00:00
Daniel Plaisted
acbc260336 Insert updated toolset
Includes FrameworkReference support
2018-08-23 18:08:42 -07:00
Daniel Plaisted
bb83ebd18c Update Winforms / WPF shared framework versions 2018-08-23 18:08:42 -07:00
Livar Cunha
057098046f Merge remote-tracking branch 'dotnet/release/2.1.5xx' into merges/release/2.1.5xx-to-release/2.2.1xx
* dotnet/release/2.1.5xx:
  MSBuild 15.9.8-preview
  MSBuild SDK Resolver Improvements (#9547)
  Remove fallback folder
  Remove redundent call, ensure no apt list
  Update links in the readme to release/2.1.5xx
  MSBuild 15.9.0-preview-000006
  Use prebuild image
  Revert "Disabled MSBuildTreatWarningsAsErrors"
  Disabled MSBuildTreatWarningsAsErrors
  Add back: "PUBLISH_NUPKG_TO_BLOB_FEED" to manage the no-suffix builds in 2.1
  Adding the 2.1.3 runtime blob feed as a feed for the CLI
  Update CLI branding to 2.1.402
  Updated test
  TestPlatform 15.9.0-preview Insertion
  Update CLI branding to 2.1.203.
  Fix warnings-as-errors in Linux packaging
  Don't let crossgen warnings become msbuild warnings-as-errors
  Fix build warning and treat msbuild warnings as errors

 Conflicts:
	README.md
	build/DependencyVersions.props
	build/package/Installer.DEB.proj
2018-08-22 20:39:52 -07:00
dotnet-maestro-bot
89579b78a5 Update coresetup to preview1-26822-01 2018-08-22 05:35:47 +00:00
Andy Gerlicher
a1fd9b00b2 MSBuild 15.9.8-preview 2018-08-21 15:31:20 -07:00
Sarabjot Singh
5df7da56ab Updating the test templates to 2.2 version 2018-08-21 23:52:55 +05:30
dotnet-maestro-bot
15c7b6a964 Update coresetup to preview1-26821-04 2018-08-21 17:31:04 +00:00
dotnet-maestro-bot
51661368b1 Update coresetup to preview1-26820-01 2018-08-20 05:31:53 +00:00
Nick Guerrera
3ccc3593c8
MSBuild SDK Resolver Improvements (#9547)
1. When there's no global.json, use latest SDK that is compatible with msbuild, not latest SDK overall
2. Respect VS setting to allow / disallow resolving to preview SDKs
2018-08-16 19:21:48 -07:00
Peter Huene
f43226c2f1
Fix test with framework-dependent apphost.
This commit fixes the `ItPublishesFrameworkDependentWithRid` test to ensure
the apphost is present in the published files.

It also runs the application from the apphost to ensure it executes
successfully.

Fixes #9843.
2018-08-15 15:06:03 -07:00
Livar
8598652885
Merge pull request #9840 from rainersigwald/msbuild-15.9.6
MSBuild 15.9.0-preview-000006
2018-08-15 08:55:01 -07:00
Rainer Sigwald
b2be5b4469 MSBuild 15.9.0-preview-000006 2018-08-15 10:18:40 -05:00
John Beisner
21f5804dfc
Merge pull request #9822 from dotnet/merges/release/2.1.4xx-to-release/2.1.5xx
Merge release/2.1.4xx to release/2.1.5xx
2018-08-14 14:07:26 -07:00
dotnet-maestro-bot
e4e4c4979b Update coresetup to preview1-26814-05 2018-08-14 17:35:42 +00:00
Livar
ef89a73d3c
Merge pull request #48 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup, coresetup to preview1-26813-02, preview1-26813-02, respectively (master)
2018-08-13 17:40:27 -07:00
Livar
2c2238a572 Adding the winforms and wpf runtime to the SDK. For now, only for zips, as we don't have a msi yet to bundle up. 2018-08-13 17:04:48 -07:00
dotnet-maestro-bot
7d37fb3c14 Update coresetup, coresetup to preview1-26813-02, preview1-26813-02, respectively 2018-08-13 17:50:20 +00:00
Vagisha Nidhi
ea47700f75 TestPlatform 15.9.0-preview Insertion 2018-08-10 14:32:29 +05:30
Nick Guerrera
6242595613 Fix warnings-as-errors in Linux packaging 2018-08-06 17:55:06 -07:00
jbeisner
1262aac3b5 Update Toolset version to 3.0.100-alpha1-009349 2018-08-06 22:29:19 +00:00
Mike Lorbetske
faeaa401c0
Update version of 2.2 templates package 2018-08-03 12:01:43 -07:00
Daniel Plaisted
cc2a2998e3 Clean up dependency versions that aren't needed after repo refactoring 2018-07-31 18:31:02 -07:00
Peter Huene
7db00ca232
Merge branch 'release/2.1.4xx' into release/2.2.1xx
* release/2.1.4xx:
  Fix dotnet sln add for multitargeted C# and VB projects.
2018-07-31 13:53:34 -07:00
Nick Guerrera
60fd63aa41
Merge pull request #9771 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-31 11:08:57 -07:00
Nick Guerrera
2c46d9d042 Update toolset and align stage0 version 2018-07-30 17:09:14 -07:00
Nick Guerrera
46f0cbfd76 Fix merge error 2018-07-30 17:09:14 -07:00
Peter Huene
96c9dc375a
Fix dotnet sln add for multitargeted C# and VB projects.
This commit integrates a fix from the SDK repo that sets
`DefaultProjectTypeGuid` for VB and C# projects when the projects are
multitargeting.  This property is used by `dotnet sln add` to determine the
project type guid to map in the solution file.

Adding additional tests that cover the multitargeting scenario for `dotnet sln
add`.

Fixes #9477.
2018-07-30 13:05:31 -07:00
Nick Guerrera
3e9d29bdf7
Merge pull request #9731 from dotnet-maestro-bot/release/2.1.401-UpdateDependencies
Update coresetup, sdk to preview1-26216-03, servicing-63124-04, respectively (release/2.1.401)
2018-07-30 12:48:22 -07:00
John Beisner
24b487abfa
Merge pull request #9763 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-30 12:32:37 -07:00
John Beisner
4f6ad7b282
Merge pull request #9764 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-30 12:32:33 -07:00
jbeisner
8780bab54e NuGetSdkResolverPackageVersion should be MicrosoftBuildNuGetSdkResolverPackageVersion 2018-07-30 14:52:06 +00:00
Nick Guerrera
a4a12840f4
Merge branch 'release/2.1.401' into release/2.1.401-UpdateDependencies 2018-07-29 18:38:00 -07:00
Nick Guerrera
4c944018e7
Merge branch 'release/2.1.4xx' into updateCompilersTo.10.2.3 2018-07-28 09:00:34 -07:00
Kevin Ransom
a666fa777b UPDate FSharp Compiler to 10.2.3 2018-07-27 16:52:56 -07:00
Nick Guerrera
29d3640768 Merge remote-tracking branch 'cli/release/2.2.1xx' into merge-cli/release/2.2.1xx-to-core-sdk/master 2018-07-27 14:47:38 -07:00
dotnet-maestro-bot
a9b8ade6aa Update roslyn to beta8-63127-03 2018-07-27 21:05:46 +00:00
Nick Guerrera
eaa5700266
Merge branch 'release/2.1.401' into merges/release/2.1.4xx-to-release/2.1.401 2018-07-27 12:55:02 -07:00
Nick Guerrera
f42505d8cd
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-27 12:54:08 -07:00
Nick Guerrera
175c421c14
Update dotnet/sdk with latest nuget inserted 2018-07-26 15:43:26 -07:00
NuGet Team Bot
53eb71801b Insert NuGet Build 4.8.0-rtm.5362 into cli 2018-07-26 10:59:33 -07:00
dotnet-maestro-bot
3adf70de81 Update coresetup, sdk to preview1-26216-03, servicing-63124-04, respectively 2018-07-25 03:22:18 +00:00
dotnet-maestro-bot
e63a8b5a52 Update coresetup, sdk to preview1-26216-03, servicing-63122-02, respectively 2018-07-23 23:25:16 +00:00
Nick Guerrera
63747aaba1
Merge pull request #9720 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-22 18:27:13 -07:00
Nick Guerrera
b9987d2442
Merge pull request #9719 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-22 18:26:42 -07:00
Nick Guerrera
fb7a22a989
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-22 08:02:02 -07:00
Nick Guerrera
d4d996d771
Merge pull request #9714 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-22 08:01:09 -07:00
Andy Gerlicher
b47915414b MSBuild 15.8.166 2018-07-21 22:10:36 -07:00
Brett V. Forsgren
cc7e978bd6 update F# to 10.2.2-rtm-180720-0 2018-07-20 13:52:35 -07:00
Nick Guerrera
e424b949e0
Merge pull request #9703 from dotnet-maestro-bot/release/2.1.4xx-UpdateDependencies
Update roslyn to beta8-63119-10 (release/2.1.4xx)
2018-07-20 12:54:02 -07:00
Nick Guerrera
4a5ca22662
Merge pull request #9707 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-20 11:33:28 -07:00
Nick Guerrera
c6931b75f7
Insert roslyn 2.9.0-beta8-63119-10 2018-07-20 10:21:38 -07:00
Nick Guerrera
13d264a275
Merge pull request #9708 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-20 09:58:35 -07:00
Peter Huene
656147725f
Update the .NET SDK version.
Bump the .NET SDK version following the NuGet insertion.
2018-07-19 18:34:25 -07:00
Nick Guerrera
b305c20871
Merge pull request #9694 from dotnet/nuget.client.release-4.8.0.5348-2-1
Insert NuGet Build 4.8.0-rtm.5348 into cli
2018-07-19 16:03:21 -07:00
dotnet-maestro-bot
3e86b9fb76 Update roslyn to beta8-63119-12 2018-07-19 20:54:13 +00:00
Nick Guerrera
9d07296cd3
Merge pull request #9704 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-19 10:21:12 -07:00
Nick Guerrera
d71eb98fde
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-18 21:52:01 -07:00
Kevin Ransom (msft)
7df8a5654f Update FSharp Compiler (#9689) 2018-07-18 17:28:02 -07:00