Commit graph

9757 commits

Author SHA1 Message Date
Matt Mitchell
3240f1919f Update branding for preview3 2018-09-13 11:19:39 -07:00
dotnet-maestro-bot
3e3ca14839 Update coresetup to preview1-26913-02 2018-09-13 17:34:13 +00:00
William Li
ce60ef7c37
Update MicrosoftNETCoreAppPackageVersion (#9973) 2018-09-11 10:58:38 -07: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
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
80bb640969
Merge pull request #9882 from livarcocc/fix_installer_notice
Updating the windows installer notice to reflect 2.2 and its requirem…
2018-08-23 11:51:06 -07:00
Matt Mitchell
4c244bd9f1
Merge pull request #9883 from livarcocc/add_socket_workaround
Adding a workaround for the sockets issue when restoring with many nuget feeds.
2018-08-23 06:07:16 -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
Livar Cunha
efa3ad3c9d Updating the windows installer notice to reflect 2.2 and its requirement of 15.9. 2018-08-22 14:00:20 -07:00
Livar Cunha
812d5dfeb6 Adding a workaround for the sockets issue when restoring with many nuget feeds. 2018-08-22 13:31:00 -07:00
Livar
c0224a2df6
Merge pull request #9873 from singhsarab/UpdateTestTemplates2.2
Updating the test templates to 2.2 version
2018-08-22 11:04:43 -07:00