Commit graph

2413 commits

Author SHA1 Message Date
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
Livar Cunha
d4e5da80b0 Fixing the external restore sources file. We needed to create the test artifact folder. 2018-08-30 16:16:44 -07:00
William Li
f5f4346310
Fix debian package tests clean up and set up (#9914)
Detect if package installed first and then uninstall
2018-08-30 10:16:28 -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
Livar
9ba8d04c6b
Merge pull request #9911 from livarcocc/fix_nuget_config_tests
Write ExternalRestoreSources to some tests NuGet.Config file
2018-08-29 08:54:03 -07:00
dotnet-maestro-bot
9d1cc32bed Update coresetup to preview1-26829-01 2018-08-29 05:36:40 +00:00
Livar Cunha
7bb693bff5 We have a few tests that write their own NuGet.Config file to use during restore. Those tests need access to the ExternalRestoreSources value to be added to this NuGet config so that they can restore properly. This change writes a file in the test/artifacts folder containing the value of ExternalRestoreSources value. The tests can then use it to write that to their NuGet.Config. There is a failure in ProdCon that this addresses. 2018-08-28 17:16:58 -07: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
Livar
3b11815531
Updating 2.2.1xx branding to preview2 2018-08-28 11:21:43 -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
d97378c31b Bundle Wpf/WinForms shared framework in installer 2018-08-23 18:08:42 -07:00
Daniel Plaisted
acbc260336 Insert updated toolset
Includes FrameworkReference support
2018-08-23 18:08:42 -07:00
Daniel Plaisted
7d72b1d4b0 Add hook to use a locally built copy of the toolset instead of downloading it 2018-08-23 18:08:42 -07:00
Daniel Plaisted
c4a33486bd Add KnownFrameworkReference items to bundled versions 2018-08-23 18:08:42 -07:00
Daniel Plaisted
703ba23999 Add blob feed as additional NuGet feed if SDK is preview 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
Livar
00e3b0b57c
Merge pull request #9849 from dotnet/merges/release/2.1.4xx-to-release/2.1.5xx
Merge release/2.1.4xx to release/2.1.5xx
2018-08-16 11:55:29 -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
William Li
d2740ce0b6 Remove fallback folder 2018-08-15 14:58:17 -07:00
William Li
25509d31b1 Remove redundent call, ensure no apt list 2018-08-15 12:40:09 -07:00
Livar
405cd21681
Merge pull request #9836 from dotnet/merges/release/2.1.4xx-to-release/2.1.5xx
Merge release/2.1.4xx to release/2.1.5xx
2018-08-15 10:03:56 -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
Livar
86007fd3a7
Merge branch 'release/2.1.5xx' into merges/release/2.1.4xx-to-release/2.1.5xx 2018-08-14 17:22:39 -07:00
William Li
1752be0f1c Revert "Disabled MSBuildTreatWarningsAsErrors"
This reverts commit 5635f0d064.
2018-08-14 15:43:31 -07: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
Livar
5635f0d064
Disabled MSBuildTreatWarningsAsErrors 2018-08-14 13:44:32 -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
jbeisner
1bd879bb18 Add back: "PUBLISH_NUPKG_TO_BLOB_FEED" to manage the no-suffix builds in 2.1 2018-08-13 23:15:29 +00:00
Livar
2c6fb386d4
Merge pull request #9814 from dotnet/updating_branding_4xx
Update CLI branding to 2.1.402
2018-08-13 11:22:23 -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
Livar
ae24082470
Merge pull request #9820 from dotnet/livarcocc-patch-1
Adding the 2.1.3 runtime blob feed as a feed for the CLI
2018-08-11 18:12:33 -07:00