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
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
Christopher Costa
1a0b8eb33a
PR feedback, refactor classes into separate files, fix missing paren
2018-08-10 14:27:17 -07:00
Christopher Costa
74e619e704
Enable ability to write a fake package name with version to dotnet/versions
2018-08-10 13:33:53 -07:00
Livar
a19e2ed102
Update CLI branding to 2.1.402
2018-08-10 10:43:31 -07:00
Vagisha Nidhi
ea47700f75
TestPlatform 15.9.0-preview Insertion
2018-08-10 14:32:29 +05:30
Nick Guerrera
6242595613
Fix warnings-as-errors in Linux packaging
2018-08-06 17:55:06 -07:00
jbeisner
1262aac3b5
Update Toolset version to 3.0.100-alpha1-009349
2018-08-06 22:29:19 +00:00
Nick Guerrera
d63625c02b
Fix build warning and treat msbuild warnings as errors
2018-08-05 15:29:14 -07:00
Mike Lorbetske
faeaa401c0
Update version of 2.2 templates package
2018-08-03 12:01:43 -07:00
Mike Lorbetske
f994743d36
Use the 2.2 common template package instead of 2.1
2018-08-03 10:45:31 -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 Cunha
817e321895
Keeping branch info as 2.1.4xx.
2018-08-02 09:02:57 -07:00
Daniel Plaisted
cc2a2998e3
Clean up dependency versions that aren't needed after repo refactoring
2018-07-31 18:31:02 -07:00
Peter Huene
7db00ca232
Merge branch 'release/2.1.4xx' into release/2.2.1xx
...
* release/2.1.4xx:
Fix dotnet sln add for multitargeted C# and VB projects.
2018-07-31 13:53:34 -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
d6d0130942
Fix test issues
2018-07-30 17:49:02 -07:00
Nick Guerrera
d6a733c76b
Add CLI side of "latest patch for 2.1" in roll-forward logic
...
Also adjust comment with real reason for skipping test, pointing
to dotnet/sdk bug.
2018-07-30 17:46:02 -07:00
Nick Guerrera
2c46d9d042
Update toolset and align stage0 version
2018-07-30 17:09:14 -07:00
Nick Guerrera
bbb8d01ef8
Set branch and channel name to master
2018-07-30 17:09:14 -07:00
Nick Guerrera
46f0cbfd76
Fix merge error
2018-07-30 17:09:14 -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
4f6ad7b282
Merge pull request #9764 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
...
Merge release/2.1.4xx to release/2.2.1xx
2018-07-30 12:32:33 -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
4c944018e7
Merge branch 'release/2.1.4xx' into updateCompilersTo.10.2.3
2018-07-28 09:00:34 -07:00
Kevin Ransom
a666fa777b
UPDate FSharp Compiler to 10.2.3
2018-07-27 16:52:56 -07:00
Nick Guerrera
29d3640768
Merge remote-tracking branch 'cli/release/2.2.1xx' into merge-cli/release/2.2.1xx-to-core-sdk/master
2018-07-27 14:47:38 -07:00
dotnet-maestro-bot
a9b8ade6aa
Update roslyn to beta8-63127-03
2018-07-27 21:05:46 +00:00