Commit graph

9397 commits

Author SHA1 Message Date
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
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
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
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
Livar
bae263c514
Merge pull request #9875 from AndyGerlicher/MSBuild-15.9.8-preview
MSBuild 15.9.8-preview
2018-08-22 11:00:58 -07: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
Livar
6bedb85dfe
Merge pull request #9854 from dagood/disable-parallel
[release/2.2.1xx] Add --disable-parallel to dotnet-new.Tests
2018-08-20 10:58:19 -07:00
William Li
3f45457548
Installer metadata in ARP uses HTTP URLs 2018-08-17 15:23:38 -07:00
Davis Goodin
6152eaabcf Add --disable-parallel to dotnet-new.Tests
Added to a "restore" executed via string literal. It's present in RestoreCommand used by the other tests already.
2018-08-17 12:52:23 -05: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
d13334ad0c
Merge pull request #9847 from peterhuene/update-sdk
Fix test with framework-dependent apphost.
2018-08-15 17:26:21 -07:00
William Li
4b9cd1f579
Merge pull request #9846 from wli3/fix-warnings
Fix warnings
2018-08-15 16:11:00 -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
Livar
106ec6624e
Merge pull request #9844 from dotnet/livarcocc-patch-1
Update links in the readme to release/2.1.5xx
2018-08-15 13:36:30 -07:00
William Li
25509d31b1 Remove redundent call, ensure no apt list 2018-08-15 12:40:09 -07:00
Livar
30c2e7570b
Update links in the readme to release/2.1.5xx 2018-08-15 10:51:23 -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
cae6528834 Use prebuild image 2018-08-14 15:48:15 -07:00
William Li
1752be0f1c Revert "Disabled MSBuildTreatWarningsAsErrors"
This reverts commit 5635f0d064.
2018-08-14 15:43:31 -07:00
Livar
5b8776a9a4
Merge pull request #9835 from dotnet/disabled_MSBuildTreatWarningsAsErrors
Disabled MSBuildTreatWarningsAsErrors
2018-08-14 15:11:49 -07:00
William Li
d7b9504c9f
Select forward arguments to restore (#9830) 2018-08-14 14:45:38 -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
Livar
aae344c165
Merge pull request #9812 from vagisha-nidhi/tp15.9previewInsertion
TestPlatform insertion for 15.9.0-preview-20180807-05 in dotnet cli
2018-08-14 13:25:08 -07:00
John Beisner
91fd3e4403
Merge pull request #9821 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-08-14 11:33:42 -07:00
John Beisner
7a6a0b227f
Merge pull request #9829 from johnbeisner/FixNoSuffixPublish
Add back: PUBLISH_NUPKG_TO_BLOB_FEED
2018-08-13 17:53:05 -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
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
Nick Guerrera
1cfc1941de
Merge pull request #9798 from nguerrera/fix-build-warning2
Fix build warnings and treat msbuild warnings as errors
2018-08-10 21:45:22 -07:00
Livar
5f1d5dabd4
Adding the 2.1.3 runtime blob feed as a feed for the CLI
This unblocks the prodcon build for 2.1.4
2018-08-10 17:28:50 -07:00
John Beisner
db65cd2d82
Merge pull request #9815 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-08-10 17:12:27 -07:00
John Beisner
81eef5e34b
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-08-10 16:05:01 -07:00
Livar
a19e2ed102
Update CLI branding to 2.1.402 2018-08-10 10:43:31 -07:00
Livar
1ed55bcc98
Merge pull request #9810 from livarcocc/update_branding_20
Update CLI branding to 2.1.203.
2018-08-10 10:26:24 -07:00
Vagisha Nidhi
00bf470ddb Updated test 2018-08-10 16:26:00 +05:30
Vagisha Nidhi
ea47700f75 TestPlatform 15.9.0-preview Insertion 2018-08-10 14:32:29 +05:30
Livar Cunha
813c6b99e7 Update CLI branding to 2.1.203. 2018-08-09 18:48:40 -07:00
Livar
8ca823bfd6
Merge pull request #9788 from dasMulli/feature/complete-suggest-configurations
Complete configurations based on project file if present.
2018-08-07 13:17:31 -07:00