Commit graph

7108 commits

Author SHA1 Message Date
Nick Guerrera
a7aeab79d8 Fix problems with excluding MSBuildSdkResolver from build 2017-10-18 16:12:14 -07:00
Eric Erhardt
aea3f64ab2 Enable CLI to build on Windows during source-build. Don't build for net46 and use correct RID for core-setup. 2017-10-18 16:12:14 -07:00
Eric Erhardt
12931ba320 Fix update-dependencies.
Don't import the root Directory.Build.props during update-dependencies because it imports generated .props files that don't exist outside of the build.

(cherry picked from commit 0491fd3826)
2017-10-18 16:12:13 -07:00
Nick Guerrera
57d256dbf5 Make copy idempotent 2017-10-18 16:12:13 -07:00
Nick Guerrera
c9eeef1790 Remove dependency on VersionTools in source builds 2017-10-18 16:12:13 -07:00
Nick Guerrera
26d8d75fef Use stable System.Reflection.Metadata 2017-10-18 16:12:13 -07:00
Nick Guerrera
5a1021ac4b Only remove Azure dependency for source builds 2017-10-18 16:12:13 -07:00
Matt Ellis
b63fb1aaf8 Remove Azure dependency from build 2017-10-18 16:12:13 -07:00
Nick Guerrera
62224b3435 Add back NuGet.Protocol dependency 2017-10-18 16:12:12 -07:00
Matt Ellis
ce7d434ae8 Remove some unneeded package references 2017-10-18 16:12:12 -07:00
Matt Ellis
16ec23f86b Provide a way to explicitly set commit count and sha 2017-10-18 12:43:34 -07:00
Nick Guerrera
218b887d87 Download stage0 when DOTNET_TOOL_DIR is not set 2017-10-18 12:43:34 -07:00
Matt Ellis
eacc4d248c Don't pull down stage 0 from the internet
The composed build will set `PREBUILT_DOTNET_TOOL_DIR` to a location
where the dotnet tool can be copied from.

Long term we should get rid of the copy in favor of just using one
from a common location, but some of the Stage0 logic in the CLI build
system will need to change, I think.
2017-10-18 12:43:33 -07:00
Matt Ellis
428d541627 Provide a way to not include the SDK Resolver
When building the entire stack for a non windows target, the windows
resolver packages will not be present (and in the case of a windows
build, you'd only have one architecture anyway). Provide a way to opt
out of including the resolver. It's only interesting for Visual
Studio insertion cases, which is something the community at large
doesn't need to worry about.
2017-10-18 12:43:33 -07:00
Matt Ellis
0b1a5b10c2 Provide a way to not include the ASP.NET Runtime Packages 2017-10-18 12:43:33 -07:00
Kevin Ransom (msft)
c58612bd2c Merge pull request #7844 from dotnet/merges/release/2.0.0-to-dev/release/2.0-20171016-070029
Merge release/2.0.0 to dev/release/2.0
2017-10-16 11:37:50 -07:00
Livar
d65f5b6558 Merge pull request #7832 from dotnet/merges/release/2.0.0-to-dev/release/2.0-20171013-070030
Merge release/2.0.0 to dev/release/2.0
2017-10-13 12:04:31 -07:00
John Beisner
f7899911a7 Merge pull request #7835 from johnbeisner/InstallScriptUpdate
Separating the URL construction methods for dotnet-install.sh
2017-10-13 10:23:36 -07:00
Livar
6f9b43d1f5 Merge pull request #7827 from dotnet/livarcocc-patch-2
Updating channel to dev/release/2.0
2017-10-13 10:10:16 -07:00
John Beisner
3d52d24058 Separating the 'legacy' URL construction from the 'current' URL construction methods and logic. 2017-10-13 09:43:04 -07:00
Livar
cea4c38789 Merge pull request #7830 from nguerrera/merge-2.0-vs
Merge release/2.0-vs into release/2.0.0
2017-10-13 09:01:17 -07:00
Nick Guerrera
fe57933b09 Merge pull request #7829 from nguerrera/port-json-flakiness-fix
Use temporary path for fake deps.json in test
2017-10-12 20:29:28 -07:00
Nick Guerrera
c0c4be7946 Merge branch 'release/2.0-vs' into merge-2.0-vs 2017-10-12 18:22:04 -07:00
Nick Guerrera
e59fd7af46 Use temporary path for fake deps.json in test
(cherry picked from commit 796b4a06e7)
2017-10-12 16:32:12 -07:00
Livar
b6c2dbf4c6 Updating channel to dev/release/2.0 2017-10-12 16:25:30 -07:00
John Beisner
cc8fe368f8 Merge pull request #7809 from johnbeisner/NugetMasterConfigRemove
'NuGet.master.config' does not appear to be used.
2017-10-11 11:52:58 -07:00
John Beisner
336998f946 Merge pull request #7810 from johnbeisner/MoveScript
Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
2017-10-11 11:52:48 -07:00
John Beisner
282de2bfe2 Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0 2017-10-11 10:53:53 -07:00
John Beisner
903001c51c 'NuGet.master.config' does not appear to be used. 2017-10-11 10:25:55 -07:00
John Beisner
ce6f396f94 Merge pull request #7794 from johnbeisner/AddTransportFeed
CLI: Adding the unified NuGet Transport feed.
2017-10-10 12:39:37 -07:00
jbeisner
b951b94629 Reverting previous change to: 'NuGet.master.config' 2017-10-10 10:34:32 -07:00
Livar
536e87518a Merge pull request #7795 from nguerrera/remove-15.5-from-2.0
Remove 15.5 from 2.0
2017-10-09 15:18:56 -07:00
Livar Cunha
fead8521c3 Moving the runtime version to 2.0.0 for the SDK.
(cherry picked from commit e24b53dda7)
2017-10-09 13:59:09 -07:00
Nick Guerrera
ddae0875cf Revert release/2.0.0 back to 1bcee43995
There were incorrect merges from release/15.5 to release/2.0.0 since then
2017-10-09 13:55:13 -07:00
jbeisner
58bdb63c53 Adding the unified transport NuGet feed. 2017-10-09 13:34:24 -07:00
Livar
da92efce24 Merge pull request #7789 from dotnet/merges/release/15.5-to-release/2.0.0-20171009-070027
Merge release/15.5 to release/2.0.0
2017-10-09 11:11:03 -07:00
Nick Guerrera
d0013186c7 Merge pull request #7751 from nguerrera/fixup-roslyn-loc
Update satellite assemblies and fix up roslyn satellite handling
2017-10-05 11:25:07 -07:00
Livar
7f4095eeb1 Merge pull request #7762 from livarcocc/merge_release155_into_release200
Merge release/15.5 into release/2.0.0
2017-10-05 10:25:58 -07:00
Livar Cunha
ed953f6d05 Keeping the branding for release/2.0.0 at 2.0.3. 2017-10-04 18:07:10 -07:00
Livar
19e631ea47 Merge pull request #7757 from livarcocc/revert_runtime_to_200
Moving the runtime version to 2.0.0 for the SDK.
2017-10-04 13:25:40 -07:00
Nick Guerrera
8dc87dc8a6 Merge pull request #7755 from nguerrera/infra-label
Change pre-release label for infrastructure work
2017-10-03 16:50:24 -07:00
Livar Cunha
e24b53dda7 Moving the runtime version to 2.0.0 for the SDK. 2017-10-03 16:46:15 -07:00
Nick Guerrera
cd68283018 Update cli-deps-satellites 2017-10-03 16:01:08 -07:00
Nick Guerrera
4a2d3fae16 Fix up roslyn satellite assembly handling to match new insertion mechanism
1. Publish satellites with a separate project and merge the resulting .deps.json
   into (csc|vbc).deps.json

2. Move the build tasks satellites to the correct location next to main assembly
   (one level higher than bincore\)
2017-10-03 16:00:56 -07:00
Nick Guerrera
f97742aa43 Change pre-release label for infrastructure work 2017-10-03 14:52:13 -07:00
Livar
2d3b8da0b0 Merge pull request #7748 from AndyGerlicher/MSBuild.15.5.113
MSBuild 15.5.113
2017-10-03 09:55:17 -07:00
Livar
72f42f9463 Merge pull request #7735 from brettfo/update-fsharp-15.5
Update FSharp compiler
2017-10-02 20:43:11 -07:00
Andy Gerlicher
cd9260f467 MSBuild 15.5.113 2017-10-02 19:03:59 -07:00
Brett V. Forsgren
6ccff28e0a Update F# compiler 2017-10-02 16:37:31 -07:00
Livar
d797f2de2c Merge pull request #7311 from khyperia/improve_roslyn
Improve the way Roslyn is pulled in
2017-10-02 16:33:56 -07:00