Commit graph

9265 commits

Author SHA1 Message Date
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
William Li
4b9cd1f579
Merge pull request #9846 from wli3/fix-warnings
Fix warnings
2018-08-15 16:11:00 -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
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
Nick Guerrera
6242595613 Fix warnings-as-errors in Linux packaging 2018-08-06 17:55:06 -07:00
Nick Guerrera
1ec1f612aa Don't let crossgen warnings become msbuild warnings-as-errors 2018-08-06 11:24:36 -07:00
Nick Guerrera
d63625c02b Fix build warning and treat msbuild warnings as errors 2018-08-05 15:29:14 -07:00
Nick Guerrera
abd6d36881
Merge pull request #9785 from nguerrera/5xx-branding
Update branding and branch info for release/2.1.5xx
2018-08-03 10:20:45 -07:00
Nick Guerrera
b2ceb7e81f Update BranchInfo to release/2.1.5xx 2018-08-02 15:47:31 -07:00
Nick Guerrera
5752a708ec Updating branding to 2.1.500 2018-08-02 15:46:15 -07:00
Livar
91b1c13032
Merge pull request #9780 from livarcocc/merge_release_401_into_400
Merge release/2.1.401 into release/2.1.400
2018-08-02 11:02:14 -07:00
Livar Cunha
817e321895 Keeping branch info as 2.1.4xx. 2018-08-02 09:02:57 -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
d095f097f8
Merge pull request #9767 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 16:26:11 -07:00
Peter Huene
8642e60a0f
Merge pull request #9766 from peterhuene/fix-default-proj-guid
Fix dotnet sln add for multitargeted C# and VB projects.
2018-07-30 14:29:00 -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
c198433a34
Merge pull request #9762 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-07-30 12:31:44 -07:00
John Beisner
ed8ee9f23b
Merge pull request #9761 from johnbeisner/FixPackageName
NuGetSdkResolverPackageVersion should be MicrosoftBuildNuGetSdkResolverPackageVersion
2018-07-30 10:49:54 -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
204ce948a7
Merge pull request #9758 from KevinRansom/updateCompilersTo.10.2.3
Update FSharp Compiler to 10.2.3
2018-07-28 10:11:58 -07:00
Nick Guerrera
4c944018e7
Merge branch 'release/2.1.4xx' into updateCompilersTo.10.2.3 2018-07-28 09:00:34 -07:00