Nick Guerrera
a149ec56cb
Update toolset to latest 2.0.3-servicing
2017-10-19 16:57:07 -07:00
Nick Guerrera
69a3c9d248
Merge dotnet/cli:dev/release/2.0 into dev/repo-refactoring
2017-10-19 16:44:10 -07:00
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
Nick Guerrera
5a1021ac4b
Only remove Azure dependency for source builds
2017-10-18 16:12:13 -07:00
Matt Ellis
16ec23f86b
Provide a way to explicitly set commit count and sha
2017-10-18 12:43:34 -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
1b4b05a44d
Merge pull request #3 from dotnet/livarcocc-patch-2
...
Update channel and version suffixes
2017-10-13 17:03:23 -07:00
Livar Cunha
03e37047a3
Fixing Windows build script.
2017-10-13 16:40:31 -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
Livar Cunha
62ae014c37
Making this repo consume the dotnet-sdk-internal zip and produce a full core-sdk by using sdk-internal, runtime, lzma, templates and store. Also deleted a bunch of now, unecessary code. I am sure there is more to be deleted though.
2017-10-13 10:45:50 -07:00
Livar
e9b0eefbd9
Update the version suffix to refac
2017-10-12 20:17:06 -07:00
Livar
a510cb2226
Update the channel to dev/repo-refactoring
2017-10-12 20:16:36 -07:00
Nick Guerrera
c0c4be7946
Merge branch 'release/2.0-vs' into merge-2.0-vs
2017-10-12 18:22:04 -07:00
Livar
b6c2dbf4c6
Updating channel to dev/release/2.0
2017-10-12 16:25:30 -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
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 Cunha
ed953f6d05
Keeping the branding for release/2.0.0 at 2.0.3.
2017-10-04 18:07:10 -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
32c0f44129
Merge branch 'release/15.5' into improve_roslyn
2017-10-02 15:13:34 -07:00
khyperia
04c8a68539
Improve the way Roslyn is pulled in
2017-10-02 08:01:44 -07:00
Andy Gerlicher
fb67e25cfb
MSBuild 15.5.110
2017-09-29 13:31:56 -07:00
Daniel Plaisted
0586375cf8
Avoid importing incompatible .props files for signing build
...
(cherry picked from commit c2ca512189
)
2017-09-27 16:55:00 -07:00
John Beisner
faca86fe62
Adding required environmental variables.
...
(cherry picked from commit 5000ba5f10
)
2017-09-27 16:54:50 -07:00
John Beisner
7b3c1bbb23
Adding consistent "Project" headers to inported props and target files.
...
(cherry picked from commit 74ad01b576
)
2017-09-27 16:54:39 -07:00
Livar Cunha
19ce791408
Updating the branding to 15.5.
2017-09-27 15:24:22 -07:00
Daniel Plaisted
41695eacb1
Update environment variables for EndToEnd test run on Debian package
...
(cherry picked from commit 6e0646f7bf
)
2017-09-27 14:45:05 -07:00
Daniel Plaisted
e2bd3e3f38
Update signing.proj to use new output paths, and import common repo props
...
(cherry picked from commit 728cea22f1
)
2017-09-27 14:45:05 -07:00
Daniel Plaisted
43febd4e9d
Remove duplicate import
...
(cherry picked from commit 88319a71f3
)
2017-09-27 14:45:04 -07:00
Daniel Plaisted
65b0df5b43
Rename output folder from out to bin
...
(cherry picked from commit 97b7553e31
)
2017-09-27 14:45:04 -07:00
Daniel Plaisted
02a07e6d8e
Delete outdated comment
...
(cherry picked from commit 546eff28c2
)
2017-09-27 14:42:05 -07:00
Daniel Plaisted
e60fe42432
Fix debian package generation
...
Previously, dotnet-deb-tool-consumer.csproj was copied to the out/artifacts folder before being restored. This no longer works as it depends on repo properties, and there is a Directory.Build.props in teh out directory to stop projects inside it from getting the repo properties. So this change restores it in-place instead.
(cherry picked from commit ac67434ea4
)
2017-09-27 14:40:57 -07:00
Daniel Plaisted
4cd03dcae4
Use shorter output paths to avoid max path issues on Windows
...
For example, "out/2" instead of "artifacts/stage2"
(cherry picked from commit dcb3a7ade7
)
2017-09-27 14:40:13 -07:00
Daniel Plaisted
ca21dee79a
Update MSI tests to use new output directory layout
...
(cherry picked from commit 2222290394
)
2017-09-27 14:37:40 -07:00
Daniel Plaisted
ca34332205
Rename Stage0 build variables to PreviousStage
...
(cherry picked from commit c6e4c8f477
)
2017-09-27 14:37:37 -07:00
Daniel Plaisted
f39315771e
Generate properties to pass to the next stage of the build
...
(cherry picked from commit 12f8c2377f
)
2017-09-27 14:22:19 -07:00
Daniel Plaisted
ee7852a790
Copy empty Directory.Build.props to artifacts folder during build instead of checking it in
...
(cherry picked from commit 884a48372d
)
2017-09-27 14:20:08 -07:00
Daniel Plaisted
2b134c91fe
Support new artifacts layout in tests and other build logic
...
(cherry picked from commit 13da213183
)
2017-09-27 14:20:05 -07:00
Daniel Plaisted
8385d37185
Move dir.props to auto-imported Directory.Build.props
...
This is necessary for setting the intermediate output path to work correctly
(cherry picked from commit ae0aa8ed24
)
2017-09-27 14:16:37 -07:00