Commit graph

9619 commits

Author SHA1 Message Date
dotnet-maestro-bot
6c68a50522 Update coresetup to preview1-26924-01 2018-09-24 05:39:56 +00:00
Livar
0a22c164ff
Merge pull request #86 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup to preview1-26921-03 (master)
2018-09-21 13:17:33 -07:00
dotnet-maestro-bot
a4aa95bf9a Update coresetup to preview1-26921-03 2018-09-21 17:42:48 +00:00
Livar
fe625f9a66
Merge pull request #85 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup to preview1-26919-02 (master)
2018-09-19 13:20:12 -07:00
dotnet-maestro-bot
e4c136e2ff Update coresetup to preview1-26919-02 2018-09-19 05:40:21 +00:00
Livar
b599ca4f75
Merge pull request #84 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup to preview1-26918-01 (master)
2018-09-18 09:42:07 -07: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
Livar
01843b2dc7
Merge pull request #82 from dotnet/livarcocc-patch-1
Updating toolset to 3.0.100-alpha1-009517
2018-09-17 16:31:42 -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
Nick Guerrera
8ce5e950b5
Merge pull request #74 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup to preview1-26913-02 (master)
2018-09-13 12:08:49 -07:00
dotnet-maestro-bot
3e3ca14839 Update coresetup to preview1-26913-02 2018-09-13 17:34:13 +00:00
William Li
0b8d850377 Set ReleaseSuffix in test asset 2018-09-10 19:38:22 -07:00
William Li
efcae15d0d Fix/disable test due to netcoreapp3.0 vs netcoreapp2.0 2018-09-09 21:56:57 -07: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
William Li
60cece6458
Merge pull request #72 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup to preview1-26909-04 (master)
2018-09-09 20:23:13 -07:00
dotnet-maestro-bot
7021c4f5b4 Update coresetup to preview1-26909-04 2018-09-09 17:32:54 +00:00
Matt Mitchell
97cb173d97
Merge pull request #69 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup to preview1-26907-05 (master)
2018-09-07 14:44:06 -07:00
dotnet-maestro-bot
9873731c2c Update coresetup to preview1-26907-05 2018-09-07 18:22:37 +00:00
Matt Mitchell
fb57b1d68c
Merge pull request #9947 from mmitche/add-updaters
Add additional package version updaters for other aspnet dependencies
2018-09-06 09:16:49 -07:00
Matt Mitchell
0408e13bc3 Update AspnetCore.All instead of AspnetCore.App 2018-09-05 09:07:44 -07:00
Daniel Plaisted
8c3806bca7
Merge pull request #71 from dsplaisted/insert-toolset
Insert updated toolset
2018-09-05 09:01:53 -07:00
Matt Mitchell
2650d3b0ad Add additional package version updaters for other aspnet dependencies 2018-09-05 08:59:17 -07:00
Daniel Plaisted
92e66541e5 Insert updated toolset 2018-09-05 07:12:26 -07:00
Matt Mitchell
f4707d384d
Merge pull request #9927 from livarcocc/fix_external_sources
Fixing the external restore sources file.
2018-08-30 22:30:59 -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
2bf5906695
Merge pull request #66 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup to preview1-26829-01 (master)
2018-08-29 09:00:21 -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
f196305b71
Merge pull request #9907 from dotnet/update_221xx_brand_to_preview2
Updating 2.2.1xx branding to preview2
2018-08-28 17:19:02 -07: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
ddd1b7ee59
Merge pull request #67 from dsplaisted/wpf-sdk-and-templates
Include WPF project templates, insert toolset with WPF SDK, insert updated WPF
2018-08-28 16:45:32 -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
Livar
a9b6019ede
Merge pull request #65 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup to preview1-26828-01 (master)
2018-08-28 09:19:14 -07:00
Matt Mitchell
8aa75cf28e
Merge pull request #9902 from livarcocc/fix_template_property_names_for_22
Changing the property names for 2.2 templates to be named 22 instead of 20.
2018-08-28 08:20:26 -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
Daniel Plaisted
1e80ec8a5f
Merge pull request #62 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup to preview1-26827-01 (master)
2018-08-27 09:49:54 -07:00
dotnet-maestro-bot
7a48e077b9 Update coresetup to preview1-26827-01 2018-08-27 05:33:25 +00:00
Livar
c259e5bd17
Merge pull request #9837 from dotnet/merges/release/2.1.5xx-to-release/2.2.1xx
Merge release/2.1.5xx to release/2.2.1xx
2018-08-24 14:30:47 -07:00
Daniel Plaisted
bd12a2f0e6
Merge pull request #63 from dsplaisted/bundled-frameworkreferences
Add bundled FrameworkReferences
2018-08-24 07:57:59 -07:00