Eric Erhardt [Mon, 9 Oct 2017 19:24:00 +0000 (14:24 -0500)]
Merge remote-tracking branch 'upstream/master' into MergeDevRelease20
Commit migrated from https://github.com/dotnet/core-setup/commit/
3443fbcae45112b69bb16f70781cadc5a3314910
Eric Erhardt [Mon, 9 Oct 2017 19:09:17 +0000 (14:09 -0500)]
Merge remote-tracking branch 'upstream/dev/release/2.0.0'
Commit migrated from https://github.com/dotnet/core-setup/commit/
3119d09f2b974336b20185924e1da828adcd30b0
Eric Erhardt [Mon, 9 Oct 2017 14:54:51 +0000 (09:54 -0500)]
Merge pull request dotnet/core-setup#3290 from dotnet-maestro-bot/master-UpdateDependencies
Update Standard, WCF to preview1-25809-01, preview2-25809-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
4eaf3c43b6949fde153e4811c871b4fa113b75d1
dotnet-maestro-bot [Mon, 9 Oct 2017 13:38:56 +0000 (06:38 -0700)]
Update Standard, WCF to preview1-25809-01, preview2-25809-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
607003c52c8e048b0be30a084448bc7a02d462f3
Eric Erhardt [Mon, 9 Oct 2017 12:51:05 +0000 (07:51 -0500)]
Merge pull request dotnet/core-setup#3286 from dotnet-maestro-bot/master-UpdateDependencies
Update CoreFx, WCF to preview1-25809-01, preview2-25808-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
efd679a739f71deb83cb29c4df18766804c3e59c
dotnet-maestro-bot [Mon, 9 Oct 2017 01:51:22 +0000 (18:51 -0700)]
Update CoreFx, WCF to preview1-25809-01, preview2-25808-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
3adaf29cbef648c8bc7db8bcfc50776b9d2c2c23
Eric Erhardt [Sat, 7 Oct 2017 19:05:30 +0000 (14:05 -0500)]
Merge pull request dotnet/core-setup#3283 from dotnet-maestro-bot/master-UpdateDependencies
Update CoreFx, WCF to preview1-25807-02, preview2-25807-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
867d832c3fbdef4ec540f8826974c5bdcb1d6e9d
dotnet-maestro-bot [Sat, 7 Oct 2017 15:56:09 +0000 (08:56 -0700)]
Update CoreFx, WCF to preview1-25807-02, preview2-25807-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
8b08f3bddad6039d34ad8112de2758b68211b350
Eric Erhardt [Fri, 6 Oct 2017 21:15:54 +0000 (16:15 -0500)]
Merge pull request dotnet/core-setup#3274 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, CoreClr, CoreFx, Standard, WCF to prerelease-02106-01, preview1-25806-01, preview1-25806-02, preview1-25806-01, preview2-25806-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
adae2f98cade68c7cb9b6bcf71e0d54259a3c732
Wes Haggard [Fri, 6 Oct 2017 20:10:22 +0000 (13:10 -0700)]
Merge pull request dotnet/core-setup#3254 from weshaggard/FixVSTemplates
Update VS templates based on VS versions
Commit migrated from https://github.com/dotnet/core-setup/commit/
e236a4252fada1f4e83d59e26ded2597026fcee0
Jan Vorlicek [Fri, 6 Oct 2017 18:34:54 +0000 (20:34 +0200)]
Merge pull request dotnet/core-setup#3277 from janvorli/update-centos-docker-image
Update CentOS 6 docker image
Commit migrated from https://github.com/dotnet/core-setup/commit/
7944bda996540ee9fbef924ea6694a872b458c77
dotnet-maestro-bot [Fri, 6 Oct 2017 14:19:32 +0000 (07:19 -0700)]
Update BuildTools, CoreClr, CoreFx, Standard, WCF to prerelease-02106-01, preview1-25806-01, preview1-25806-02, preview1-25806-01, preview2-25806-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
8070d6f3fbb6021f33908b6941bd98f98e6ebe14
Jan Vorlicek [Thu, 5 Oct 2017 23:24:44 +0000 (01:24 +0200)]
Update docker images
This change updates docker images for CentOS 6 and ubuntu 14.04 ARM.
It also replaces RHEL 7 docker image with CentOS 7 one.
The images now contain clang 3.9 with PGO support
Commit migrated from https://github.com/dotnet/core-setup/commit/
5f17aecff4bcd7ae1e905294fae9d3b30a53cf96
Eric Erhardt [Thu, 5 Oct 2017 02:18:06 +0000 (21:18 -0500)]
Merge pull request dotnet/core-setup#3272 from eerhardt/RemoveSourceBuildPatches
Build custom tasks for net45 on Windows, even when building in source-build.
Commit migrated from https://github.com/dotnet/core-setup/commit/
b455822f06b05453cfdbde8b2396ede0464a04c8
Eric Erhardt [Wed, 4 Oct 2017 22:51:07 +0000 (17:51 -0500)]
Build custom tasks for net45 on Windows, even when building in source-build.
Commit migrated from https://github.com/dotnet/core-setup/commit/
1063874bdcff70192516ba374c173296eeb84301
Wes Haggard [Fri, 29 Sep 2017 21:18:47 +0000 (14:18 -0700)]
Update VS templates based on VS versions
Commit migrated from https://github.com/dotnet/core-setup/commit/
ea2cc892d61ed4671bc4b2aba9aeb7c5896d73e4
Eric Erhardt [Wed, 4 Oct 2017 20:17:31 +0000 (15:17 -0500)]
Merge pull request dotnet/core-setup#3270 from eerhardt/RemoveSourceBuildPatches
Disable including source files in nupkgs during source-build to work around the long path limitation.
Commit migrated from https://github.com/dotnet/core-setup/commit/
4c9ece12da6caeea0733510e1059cb84f4c2e0f7
Eric Erhardt [Wed, 4 Oct 2017 19:40:13 +0000 (14:40 -0500)]
Merge pull request dotnet/core-setup#3271 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, WCF to prerelease-02104-03, preview2-25804-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
d7df7e59ad9960bd8e6502ae58bebffb8ebd7444
dotnet-maestro-bot [Wed, 4 Oct 2017 17:28:04 +0000 (10:28 -0700)]
Update BuildTools, WCF to prerelease-02104-03, preview2-25804-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
fb339eb4010e5b9e32c13a17085fbcc6db0314d8
Eric Erhardt [Wed, 4 Oct 2017 15:59:32 +0000 (10:59 -0500)]
Disable including source files in nupkgs during source-build to work around the long path limitation.
Commit migrated from https://github.com/dotnet/core-setup/commit/
fb2b7cba3e0e71fd4d0930af720dfd4e5f9c69de
Eric Erhardt [Wed, 4 Oct 2017 14:03:47 +0000 (09:03 -0500)]
Merge pull request dotnet/core-setup#3268 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, CoreFx to prerelease-02104-02, preview1-25804-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
4460735f87ce6ea1cbfb749d9d95bd9f5d92c138
dotnet-maestro-bot [Wed, 4 Oct 2017 01:46:57 +0000 (18:46 -0700)]
Update BuildTools, CoreFx to prerelease-02104-02, preview1-25804-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
05955a422330d71edce1df3f19a506700002d456
Eric Erhardt [Tue, 3 Oct 2017 23:06:35 +0000 (18:06 -0500)]
Merge pull request dotnet/core-setup#3266 from eerhardt/RemoveSourceBuildPatches
Handle RIDs better during the build.
Commit migrated from https://github.com/dotnet/core-setup/commit/
330ef47de3e9a18c007dac408ac907215486dd86
Eric Erhardt [Tue, 3 Oct 2017 22:57:08 +0000 (17:57 -0500)]
Merge pull request dotnet/core-setup#3267 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools to prerelease-02103-02 (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
162bce049b29efe47f8ea2992c5d26d2ccdbc728
dotnet-maestro-bot [Tue, 3 Oct 2017 21:30:45 +0000 (14:30 -0700)]
Update BuildTools to prerelease-02103-02
Commit migrated from https://github.com/dotnet/core-setup/commit/
d03b39df5ff081df471255fc1310c3ba3fcdd854
Eric Erhardt [Tue, 3 Oct 2017 20:54:10 +0000 (15:54 -0500)]
Handle RIDs better during the build.
Currently, when building non-portable on a win10 machine, core-setup restores and produces `win7` RID assets. This causes problems in source-build since corefx produces `win10` assets on the same machine. Thus, core-setup can't use the corefx assets because win10 is not compatible with win7.
In fixing this, I refactored the way RIDs are handled during the build. We have 3 main RID usages:
* What is the RID of the current machine? $(HostMachineRid)
* What is the RID of the toolset we are using to build? core-setup doesn't have this scenario yet, but corefx calls this $(ToolRuntimeRID)
* What is the RID that the current build is producing outputs for? $(OutputRid)
Commit migrated from https://github.com/dotnet/core-setup/commit/
815ca5d26986fab7a5e19cf997ad9c50455f21c6
Jan Vorlicek [Tue, 3 Oct 2017 18:35:56 +0000 (20:35 +0200)]
Merge pull request dotnet/core-setup#3228 from wfurt/freebsd
add basic FreeBSD support
Commit migrated from https://github.com/dotnet/core-setup/commit/
9dff3ce12574699e6d4d31722047f775d92d05fd
Eric Erhardt [Tue, 3 Oct 2017 18:24:02 +0000 (13:24 -0500)]
Merge pull request dotnet/core-setup#3253 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, CoreClr, CoreFx, Standard, WCF to prerelease-02102-02, preview1-25803-02, preview1-25803-01, preview1-25802-01, preview2-25803-02, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
300051f20e64d80cbd66623309c33420cc72e8a5
dotnet-maestro-bot [Tue, 3 Oct 2017 13:05:12 +0000 (06:05 -0700)]
Update BuildTools, CoreClr, CoreFx, Standard, WCF to prerelease-02102-02, preview1-25803-02, preview1-25803-01, preview1-25802-01, preview2-25803-02, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
15c1ebe8d9c37655b72d2b7cb310b50a00b02249
Eric Erhardt [Tue, 3 Oct 2017 02:27:57 +0000 (21:27 -0500)]
Merge pull request dotnet/core-setup#3263 from eerhardt/RemoveSourceBuildPatches
Fix dotnet publish of sharedFramework on source-build.
Commit migrated from https://github.com/dotnet/core-setup/commit/
50955f6056ca439d6df3b4eafac885eb19e30aa3
Eric Erhardt [Mon, 2 Oct 2017 23:14:09 +0000 (18:14 -0500)]
Fix dotnet publish of sharedFramework on source-build.
Commit migrated from https://github.com/dotnet/core-setup/commit/
b4e013374b9eb06b00149f285a93d309e008cafb
Eric Erhardt [Mon, 2 Oct 2017 16:01:13 +0000 (11:01 -0500)]
Merge pull request dotnet/core-setup#3257 from eerhardt/RemoveSourceBuildPatches
Remove source build patches
Commit migrated from https://github.com/dotnet/core-setup/commit/
aae052b088deaa6dd7402b15fb330a711b5537f2
Eric Erhardt [Sat, 30 Sep 2017 00:13:39 +0000 (19:13 -0500)]
Use intermediate package cache to pick up source built packages.
There are cases where we build the same version of an already shipped package, and need to ensure we use the package that was built locally.
Commit migrated from https://github.com/dotnet/core-setup/commit/
9664a4db695d384e7f0bbf3ba26b026d524d3adf
Eric Erhardt [Fri, 29 Sep 2017 22:11:51 +0000 (17:11 -0500)]
Unify Versions
Commit migrated from https://github.com/dotnet/core-setup/commit/
f380a2a41db680480960b9a8fc91ff21f3422b05
Eric Erhardt [Fri, 29 Sep 2017 21:59:28 +0000 (16:59 -0500)]
Don't build net45 versions of tasks
Commit migrated from https://github.com/dotnet/core-setup/commit/
73f497be32b0d478e02cd79aebb54949a9af5d02
Eric Erhardt [Fri, 29 Sep 2017 21:48:56 +0000 (16:48 -0500)]
Update MSBuild Reference
Commit migrated from https://github.com/dotnet/core-setup/commit/
51c9c44d473921775bf7d5c79aef50fe0f031d7e
Eric Erhardt [Fri, 29 Sep 2017 20:06:10 +0000 (15:06 -0500)]
Unify CLI Version with corefx release/2.0.0 branch
Commit migrated from https://github.com/dotnet/core-setup/commit/
769f784a53bfb699f5d863f9a7573b0bab83aa9a
Eric Erhardt [Fri, 29 Sep 2017 19:57:40 +0000 (14:57 -0500)]
Unify NuGet version with BuildTools version
Commit migrated from https://github.com/dotnet/core-setup/commit/
91d349f85d5b88727d6e7769acfa5229c57290eb
Eric Erhardt [Fri, 29 Sep 2017 19:41:19 +0000 (14:41 -0500)]
Respect DotNetRestorePackagesPath if it is set
Commit migrated from https://github.com/dotnet/core-setup/commit/
129ee6db61b6913403f037ee2bafa3cea57f600b
Eric Erhardt [Fri, 29 Sep 2017 19:27:12 +0000 (14:27 -0500)]
Update BuildTools and init-tools scripts.
Using the latest 2.0.0 BuildTools and the latest init-tools scripts from corefx.
Commit migrated from https://github.com/dotnet/core-setup/commit/
b9b9aaeb26ee43c03f7cf04cb25d6f863eb77eed
Eric Erhardt [Fri, 29 Sep 2017 12:42:03 +0000 (07:42 -0500)]
Merge pull request dotnet/core-setup#3250 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, CoreFx, WCF to prerelease-02029-01, preview1-25729-01, preview2-25728-13, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
c846080e43cbb2f85225794b4c7b2ac67ababb80
dotnet-maestro-bot [Fri, 29 Sep 2017 01:47:55 +0000 (18:47 -0700)]
Update BuildTools, CoreFx, WCF to prerelease-02029-01, preview1-25729-01, preview2-25728-13, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
caaa8ae521f23311fe88b90c7e0ed590eb3ec7d1
Wes Haggard [Fri, 29 Sep 2017 00:15:03 +0000 (17:15 -0700)]
Merge pull request dotnet/core-setup#3252 from weshaggard/FixPathIssues
Change to current directory after calling VSDevCmd.bat
Commit migrated from https://github.com/dotnet/core-setup/commit/
a198ac4e6e217ca4313641795fba5ec0f5612ecc
Wes Haggard [Fri, 29 Sep 2017 00:08:52 +0000 (17:08 -0700)]
Change to current directory after calling VSDevCmd.bat
VSDevCmd.bat switches to a user directory so we need to ensure
we are switched back to the root of the repo in order for the
commands that take relative paths to projects to work. This will
allow you to build the repo from a clean cmd prompt again (still
requires VS installed)
Commit migrated from https://github.com/dotnet/core-setup/commit/
0da8d6f6d7ee851e8ae6d3b4a0711381d3bbe844
Wes Haggard [Thu, 28 Sep 2017 23:44:35 +0000 (16:44 -0700)]
Merge pull request dotnet/core-setup#3251 from weshaggard/FixPlatformIssueWithCMake
Only change platform to AnyCPU for csproj files
Commit migrated from https://github.com/dotnet/core-setup/commit/
f62984e73ab6197b6414d36d1ca2b4d496cfd744
Eric Erhardt [Thu, 28 Sep 2017 23:04:00 +0000 (18:04 -0500)]
Merge pull request dotnet/core-setup#3235 from eerhardt/RemoveSourceBuildPatches
Port build changes from master to dev/release/2.0.0
Commit migrated from https://github.com/dotnet/core-setup/commit/
091bdd289046a3e861bd494075506eb0b3ff94f1
Wes Haggard [Thu, 28 Sep 2017 22:29:40 +0000 (15:29 -0700)]
Only change platform to AnyCPU for csproj files
Commit migrated from https://github.com/dotnet/core-setup/commit/
361b027cad36573b8b00f6ad2b6d8d572f55fedf
Eric Erhardt [Thu, 28 Sep 2017 14:29:50 +0000 (09:29 -0500)]
Merge pull request dotnet/core-setup#3244 from dotnet-maestro-bot/master-UpdateDependencies
Update CoreFx, Standard to preview1-25728-02, preview1-25728-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
6cc1cb9c74b5dc80ad40c8cd14136324b2ae4213
dotnet-maestro-bot [Thu, 28 Sep 2017 13:47:43 +0000 (06:47 -0700)]
Update CoreFx, Standard to preview1-25728-02, preview1-25728-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
e730cfcc0274ea63db37d4c99ed0874f89f15cd8
Santiago Fernandez Madero [Wed, 27 Sep 2017 21:27:34 +0000 (14:27 -0700)]
Use PublishDirectory to index the packages that where shipped (dotnet/core-setup#3242)
Commit migrated from https://github.com/dotnet/core-setup/commit/
c57456fb2d0251dbdd1e48140f4258467a4abfd9
Eric Erhardt [Wed, 27 Sep 2017 21:07:50 +0000 (16:07 -0500)]
Merge pull request dotnet/core-setup#3231 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, CoreFx, Standard to prerelease-02027-03, preview1-25726-06, preview1-25727-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
03b2826fd983f2dfbec00873caf79742f289569b
dotnet-maestro-bot [Wed, 27 Sep 2017 18:17:39 +0000 (11:17 -0700)]
Update BuildTools, CoreFx, Standard to prerelease-02027-03, preview1-25726-06, preview1-25727-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
f3b1114d455df3a5162a7f7947938a656e5a5433
Santiago Fernandez Madero [Wed, 27 Sep 2017 17:30:09 +0000 (10:30 -0700)]
Fix publish build issue (dotnet/core-setup#3241)
Commit migrated from https://github.com/dotnet/core-setup/commit/
eb60f0bf20c52b49032953763519d904b134c473
Eric Erhardt [Wed, 27 Sep 2017 00:52:55 +0000 (19:52 -0500)]
Merge pull request dotnet/core-setup#3238 from eerhardt/VersionSuffixFix
Port VersionSuffix changes from release/2.0.0 to master.
Commit migrated from https://github.com/dotnet/core-setup/commit/
652b680dff6b1afb9cd26cc3c2e883a664c209fd
Santiago Fernandez Madero [Wed, 27 Sep 2017 00:29:41 +0000 (17:29 -0700)]
Fix SigningValidation (dotnet/core-setup#3240)
* Fix SigningValidation
* Delete unneccessary SigntType in pipeline.json forgotted to delete previously
Commit migrated from https://github.com/dotnet/core-setup/commit/
80f1762d9ea68656fa3c1f369659a44c3a3c1017
Santiago Fernandez Madero [Tue, 26 Sep 2017 22:36:34 +0000 (15:36 -0700)]
Fix build break (dotnet/core-setup#3239)
Commit migrated from https://github.com/dotnet/core-setup/commit/
b039179ff5301318b1ce8eb00baf2278172f15d6
Eric Erhardt [Tue, 26 Sep 2017 22:06:36 +0000 (17:06 -0500)]
Port VersionSuffix changes from release/2.0.0 to
This change brings https://github.com/dotnet/core-setup/commit/dotnet/core-setup@
d85d263924c2ee7b7109d4ee209275ad1dbcb2b4 into master, along with removing an unnecessary VersionSuffix setting in CommonManaged.props.
Commit migrated from https://github.com/dotnet/core-setup/commit/
4afde938556de26d8a1f923543689129b083468f
Santiago Fernandez Madero [Tue, 26 Sep 2017 21:59:54 +0000 (14:59 -0700)]
Fix build break (dotnet/core-setup#3237)
Commit migrated from https://github.com/dotnet/core-setup/commit/
a57789fdf59cd561a8093736e6d268d028ee6a9e
Santiago Fernandez Madero [Tue, 26 Sep 2017 21:34:03 +0000 (14:34 -0700)]
Fix build break (dotnet/core-setup#3236)
Commit migrated from https://github.com/dotnet/core-setup/commit/
095fe70b673b7e46d2ef6154185e51d035e23372
Eric Erhardt [Tue, 26 Sep 2017 20:55:12 +0000 (15:55 -0500)]
Update BuildTools to 2.0.0-servicing-02026-05
Commit migrated from https://github.com/dotnet/core-setup/commit/
828915fb7c97e1051374bcb194b087e014113f83
Santiago Fernandez Madero [Tue, 26 Sep 2017 20:32:38 +0000 (13:32 -0700)]
Fix build break (dotnet/core-setup#3234)
Commit migrated from https://github.com/dotnet/core-setup/commit/
052c12e2ceb89818bdeaf0acc7947f846977b8fe
Eric Erhardt [Mon, 25 Sep 2017 21:10:58 +0000 (16:10 -0500)]
Fixing up changes from master.
Commit migrated from https://github.com/dotnet/core-setup/commit/
742af6fcbd3e6a6199392dcc0dbe95cf72c6de1e
Eric Erhardt [Wed, 30 Aug 2017 22:10:24 +0000 (17:10 -0500)]
Default Platform=AnyCPU for managed projects.
Also clean up the "Architecture" MSBuild property, which isn't used.
Commit migrated from https://github.com/dotnet/core-setup/commit/
edf50f8c2af8d1f2804668286e9e88d83e5c682d
Eric Erhardt [Wed, 30 Aug 2017 19:20:32 +0000 (14:20 -0500)]
Fix the tests by passing Configuration into the tests.
Fix the build on non-Windows by passing the right MSBuild properties down.
Respond to PR feedback.
Commit migrated from https://github.com/dotnet/core-setup/commit/
78341778f74b65c707e5d7f0acd8b54f68e4ff07
Eric Erhardt [Wed, 30 Aug 2017 15:39:44 +0000 (10:39 -0500)]
Pass through the Configuration when restoring.
Since BaseIntermediateOutputPath depends on Configuration, it needs to be flown properly.
Commit migrated from https://github.com/dotnet/core-setup/commit/
a4125aba3ec16a6fc0a97430692c086fc9240c79
Eric Erhardt [Tue, 29 Aug 2017 22:36:51 +0000 (17:36 -0500)]
Clean up core-setup build.
Set DisableImplicitNuGetFallbackFolder=false to ensure we never use the NuGet fallback folder that comes with the SDK.
Enable SDK-based projects to import the root dir.props file. This spawned a few one-off changes since things like the BaseIntermediateOutputPath is now under RepoRoot\Bin and TreatWarningsAsErrors=true.
Commit migrated from https://github.com/dotnet/core-setup/commit/
5bcfb4b8b91b7e731ad07e4d1bc6aefca3862c91
Eric Erhardt [Tue, 29 Aug 2017 22:05:29 +0000 (17:05 -0500)]
Removing dead test code.
Commit migrated from https://github.com/dotnet/core-setup/commit/
14b3a1c34b5bb2deb0e85d6fba4dbffd53597b95
Eric Erhardt [Thu, 8 Jun 2017 22:30:16 +0000 (17:30 -0500)]
Minor cleanup of CommonManaged.props
Commit migrated from https://github.com/dotnet/core-setup/commit/
5f650ab5ec5afcf47b68597f1b7b74d15d51e134
Eric Erhardt [Thu, 8 Jun 2017 22:00:31 +0000 (17:00 -0500)]
Move common repo directories to isolated props file.
Also remove the dev machine BuildNumberMinor workaround per PR feedback, as this is no longer necessary.
Commit migrated from https://github.com/dotnet/core-setup/commit/
9555bd94c1da166338017939d584c75cdf6698b8
Eric Erhardt [Wed, 7 Jun 2017 03:08:22 +0000 (22:08 -0500)]
Fix VersionSuffix for the managed projects
VersionSuffix is getting set before $(BuildNumberMajor) and $(BuildNumberMinor) are being set. When creating the DependencyModel nupkg, it is getting a bad version on its p2p reference to PlatformAbstractions.
The fix is to ensure VersionSuffix is defined correctly in the projects themselves - after the obj\BuildVersion.props file is created.
Workaround https://github.com/NuGet/Home/issues/4337
Commit migrated from https://github.com/dotnet/core-setup/commit/
df6ab9c2a48b47181bedfb2704888b074e8a269a
Eric Erhardt [Thu, 21 Sep 2017 13:34:14 +0000 (08:34 -0500)]
Merge pull request dotnet/core-setup#3229 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, CoreClr, Standard, WCF to prerelease-02020-01, preview1-25720-03, preview1-25720-01, preview2-25720-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
e3ced0bb9362fc73d6728a7d85f87fc56cd41359
Tomas Weinfurt [Wed, 20 Sep 2017 22:23:31 +0000 (15:23 -0700)]
return only major version for FreeBSD so it is consistent with rid. Fix net45 build
Commit migrated from https://github.com/dotnet/core-setup/commit/
b8a2d3c3c81bc9a3087c425080d1270bd7c5b16a
Tomas Weinfurt [Wed, 20 Sep 2017 19:25:38 +0000 (12:25 -0700)]
remove debug echo
Commit migrated from https://github.com/dotnet/core-setup/commit/
a4be239702c24de55cafb4bb1fe7ffcdc539a9a4
Tomas Weinfurt [Wed, 20 Sep 2017 18:54:21 +0000 (11:54 -0700)]
set RID as freebsd.11 for FreeBSD. add missing parts to PAL and build script
Commit migrated from https://github.com/dotnet/core-setup/commit/
9f16aea7056cb0d62839236dffe82d0bd4ec3b48
dotnet-maestro-bot [Wed, 20 Sep 2017 13:38:13 +0000 (06:38 -0700)]
Update BuildTools, CoreClr, Standard, WCF to prerelease-02020-01, preview1-25720-03, preview1-25720-01, preview2-25720-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
f8866c096d7d46b35f0b3fd4cd8284de652ed970
Eric Erhardt [Tue, 19 Sep 2017 12:24:57 +0000 (07:24 -0500)]
Merge pull request dotnet/core-setup#3225 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, CoreClr, CoreFx, Standard, WCF to prerelease-02019-01, preview1-25718-02, preview1-25718-03, preview1-25718-01, preview2-25718-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
b5c917c0b24171ae27c7cfcfd2617b1088d41c11
dotnet-maestro-bot [Tue, 19 Sep 2017 00:57:51 +0000 (17:57 -0700)]
Update BuildTools, CoreClr, CoreFx, Standard, WCF to prerelease-02019-01, preview1-25718-02, preview1-25718-03, preview1-25718-01, preview2-25718-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
be820cf4dbbda52c4b8f220fa386e4f0dcadb90c
Tomas Weinfurt [Sat, 16 Sep 2017 00:47:12 +0000 (17:47 -0700)]
add basic FreeBSD support
Commit migrated from https://github.com/dotnet/core-setup/commit/
c616e56ad9492d6984b3405217abd2db9757d0c9
JC Aguilera [Fri, 15 Sep 2017 23:41:37 +0000 (16:41 -0700)]
Updating platform value
Commit migrated from https://github.com/dotnet/core-setup/commit/
445bc0e50d70764cabde883ad912894ee3ed8ae3
Eric Erhardt [Fri, 15 Sep 2017 22:33:49 +0000 (17:33 -0500)]
Merge pull request dotnet/core-setup#3224 from dotnet/signDisableUWP
Don't check for UWP files while signing in arm64
Commit migrated from https://github.com/dotnet/core-setup/commit/
b956709c5511de37f3b621c36b6e9849d476918b
JC Aguilera [Fri, 15 Sep 2017 21:56:02 +0000 (14:56 -0700)]
Addressing Eric comments
Commit migrated from https://github.com/dotnet/core-setup/commit/
31cde0f9693a3409c54b0daa083f325e98c40a58
JC Aguilera [Fri, 15 Sep 2017 21:48:17 +0000 (14:48 -0700)]
Don't check for UWP files while signing in arm64
UWP is not supported in arm64, hence do not check for the existence of files to sign if the RID is win-arm64
Commit migrated from https://github.com/dotnet/core-setup/commit/
b84bbe8844fcd641fd3526ed9c182ddcf9f1b2f7
Eric Erhardt [Fri, 15 Sep 2017 19:21:41 +0000 (14:21 -0500)]
Merge pull request dotnet/core-setup#3223 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, CoreClr, WCF to prerelease-02015-01, preview1-25715-02, preview2-25715-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
1d0beb92d5b1816d587acf2900f45ffa44092d01
dotnet-maestro-bot [Fri, 15 Sep 2017 17:46:52 +0000 (10:46 -0700)]
Update BuildTools, CoreClr, WCF to prerelease-02015-01, preview1-25715-02, preview2-25715-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
c9e4c63b0387d0bf57a05b0725f54e46c57c29e2
Eric Erhardt [Fri, 15 Sep 2017 02:13:28 +0000 (21:13 -0500)]
Merge pull request dotnet/core-setup#3222 from dotnet-maestro-bot/master-UpdateDependencies
Update CoreClr to preview1-25715-01 (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
a81424ee3449b2d46075fb85f2c269a35904f4ea
dotnet-maestro-bot [Fri, 15 Sep 2017 00:57:51 +0000 (17:57 -0700)]
Update CoreClr to preview1-25715-01
Commit migrated from https://github.com/dotnet/core-setup/commit/
60bd08e9e409dd71fde08a332517c387e9814a3e
Wes Haggard [Thu, 14 Sep 2017 22:21:10 +0000 (15:21 -0700)]
Merge pull request dotnet/core-setup#3188 from janvorli/port-add-rhel6-detection
Port to 2.0.0: Add RHEL 6 and CentOS 6 distro detection
Commit migrated from https://github.com/dotnet/core-setup/commit/
bb6dac8404513d5ac5a1a216e362ec2ff5ea8ef5
JC Aguilera [Thu, 14 Sep 2017 22:19:59 +0000 (15:19 -0700)]
Merge pull request dotnet/core-setup#3218 from dotnet/signingErrorChecks_m
Add error checks
Commit migrated from https://github.com/dotnet/core-setup/commit/
11eb38cd2c0baaa3a9eebe061899a2911d68f156
Eric Erhardt [Thu, 14 Sep 2017 21:53:01 +0000 (16:53 -0500)]
Merge pull request dotnet/core-setup#3219 from dotnet/signingErrorChecks_2.0
Add error checks
Commit migrated from https://github.com/dotnet/core-setup/commit/
e10d9cfb54de9777d5d9f17bf2dd4955130c6b1e
JC Aguilera [Thu, 14 Sep 2017 21:08:14 +0000 (14:08 -0700)]
Add error checks
Commit migrated from https://github.com/dotnet/core-setup/commit/
74fe13aa427694c4eabda630f1dfdc7f348c7f86
JC Aguilera [Thu, 14 Sep 2017 21:03:28 +0000 (14:03 -0700)]
Add error checks
Commit migrated from https://github.com/dotnet/core-setup/commit/
1b20c848fb63e11c03af89d30f774b5e8c6b66cd
Jan Vorlicek [Thu, 14 Sep 2017 19:34:55 +0000 (21:34 +0200)]
Merge pull request dotnet/core-setup#3212 from janvorli/enable-end-to-end-alpine-build
Enable end to end Alpine core-setup build
Commit migrated from https://github.com/dotnet/core-setup/commit/
42409f0ec01f922b8ee6480e2e68046373fab05c
Jan Vorlicek [Thu, 14 Sep 2017 14:37:04 +0000 (16:37 +0200)]
Enable end to end Alpine core-setup build
This change enables full end to end build of core-setup including
managed code on Alpine Linux.
Commit migrated from https://github.com/dotnet/core-setup/commit/
c8a27076f93c3107759b8a86a02ea4f40d100b67
Eric Erhardt [Thu, 14 Sep 2017 18:12:04 +0000 (13:12 -0500)]
Merge pull request dotnet/core-setup#3216 from eerhardt/FixDependencies
Fix up dependency property names to match release/2.0
Commit migrated from https://github.com/dotnet/core-setup/commit/
23a0866d0a5c0f039356576862b7a492428b0487
Eric Erhardt [Thu, 14 Sep 2017 17:32:46 +0000 (12:32 -0500)]
Fix up dependency property names to match release/2.0
Commit migrated from https://github.com/dotnet/core-setup/commit/
df912504f3b47b32e87288adb456038079b3bc69
Eric Erhardt [Thu, 14 Sep 2017 15:34:34 +0000 (10:34 -0500)]
Merge pull request dotnet/core-setup#3208 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, CoreClr, Standard, WCF to prerelease-02014-02, preview1-25714-01, preview1-25714-01, preview2-25714-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
1f732a824b69e63bc77d9cccd8bacfc834fdb25f
dotnet-maestro-bot [Thu, 14 Sep 2017 13:28:19 +0000 (06:28 -0700)]
Update BuildTools, CoreClr, Standard, WCF to prerelease-02014-02, preview1-25714-01, preview1-25714-01, preview2-25714-01, respectively
Commit migrated from https://github.com/dotnet/core-setup/commit/
b1b8aa0be392bd56f078aab41292210a11cd5250
Eric Erhardt [Wed, 13 Sep 2017 22:16:43 +0000 (17:16 -0500)]
Merge pull request dotnet/core-setup#3205 from eerhardt/FixPlatformManifest
Fix PlatformManifest generation
Commit migrated from https://github.com/dotnet/core-setup/commit/
d8506af44e37edab6d7ea6087cafcea132a86e7d
Eric Erhardt [Wed, 13 Sep 2017 21:43:15 +0000 (16:43 -0500)]
Merge pull request dotnet/core-setup#3197 from dotnet-maestro-bot/master-UpdateDependencies
Update BuildTools, CoreClr, Standard, WCF to prerelease-02012-02, preview1-25713-01, preview1-25713-01, preview2-25713-01, respectively (master)
Commit migrated from https://github.com/dotnet/core-setup/commit/
ea4c6fd88aca82035aa92619851019fa3fe1d6db
Eric Erhardt [Wed, 13 Sep 2017 21:32:27 +0000 (16:32 -0500)]
Fix PlatformManifest generation
When we generate the PlatformManifest.txt, and an assembly doesn't have a valid FileVersion, we are never updating the first entry that gets put into the fileVersions collection. This is because the check for AssemblyVersion only updates the entry if both current and existing AssemblyVersions are non-null.
Fixing it check for current != null and existing == null, to update the entry.
Fix https://github.com/dotnet/corefx/issues/23988
Commit migrated from https://github.com/dotnet/core-setup/commit/
7de6db235d2a3c62f580bb71a194385611f5db08