Commit graph

8262 commits

Author SHA1 Message Date
Livar
6894eb0e6e
Merge pull request #8240 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26015-04 (master)
2017-12-18 16:12:20 -08:00
Livar
72ead45476
Merge pull request #8261 from dotnet/merges/release/2.1-to-master-20171218-080046
Merge release/2.1 to master
2017-12-18 16:12:05 -08:00
Livar
6ef4b794b2
Merge branch 'master' into merges/release/2.1-to-master-20171218-080046 2017-12-18 09:51:07 -08:00
Livar
b8f5972491
Merge pull request #8222 from peterhuene/dotnet-run-output
Make restore performed by run command default to nologo and quiet.
2017-12-18 09:35:35 -08:00
Livar Cunha
5f494e8b4a Merged PR 98752: Adding the 2.0.3 asp.net store to the native installer tests.
Adding the 2.0.3 asp.net store to the native installer tests.
2017-12-17 22:41:38 +00:00
William Lee
d833eaa657
Fix windows keep adding tools path to env:PATH (#8248)
Environment.GetEnvironmentVariable(PathName) means

Environment.GetEnvironmentVariable(PathName,
EnvironmentVariableTarget.Process)

However, I have added to .User. So the detection of path existence
failed. And it ends up adding the path again and again
2017-12-15 15:04:59 -08:00
Livar Cunha
d5c6133238 Adding the 2.0.3 asp.net store to the native installer tests. 2017-12-15 14:46:42 -08:00
dotnet-bot
7d968b0944 Update CoreSetup to preview1-26015-04 2017-12-15 22:28:58 +00:00
John Luo
34c2b91200 Merged PR 98632: Update to consume aspnetcore 2.0.5-147
Update to consume aspnetcore 2.0.5-147

Drop available at msrc-2-0-aspnet-20171214
2017-12-15 04:56:07 +00:00
John Luo
bf3102d718 Update to consume aspnetcore 2.0.5-147 2017-12-14 20:45:17 -08:00
Jose Perez Rodriguez
af258af035 Update the support package on the CLI to fix binding redirects on 4.7.1 2017-12-14 14:00:39 -08:00
Livar
a86e59aa5d
Merge pull request #8241 from dotnet/update_sdk
Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62414-02
2017-12-13 20:03:49 -08:00
Livar
3cac822511
Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62414-02 2017-12-13 19:26:21 -08:00
Livar Cunha
275e4c9986 Merged PR 98367: Update to consume aspnetcore 2.0.5-146
Update to consume aspnetcore 2.0.5-146
2017-12-14 00:48:13 +00:00
John Luo
34ec8c2480 Update to consume aspnetcore 2.0.5-146 2017-12-13 16:45:48 -08:00
Livar
d0fdc2e840
Merge pull request #8236 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26013-05 (master)
2017-12-13 16:31:18 -08:00
dotnet-bot
8cbb59854e Update CoreSetup to preview1-26013-05 2017-12-13 22:11:47 +00:00
John Beisner
da63455015
Merge pull request #8213 from johnbeisner/ExplictDependencies
Use explicit and non-preview versions for the build DLL dependencies
2017-12-13 12:51:13 -08:00
Livar
366eeb3206
Merge pull request #8235 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26013-04 (master)
2017-12-13 12:04:21 -08:00
dotnet-bot
50f203396f Update CoreSetup to preview1-26013-04 2017-12-13 18:22:59 +00:00
Livar Cunha
ed916733ee Updating the runtime to 2.0.5. 2017-12-13 09:27:06 -08:00
Jan Vorlicek
4d615db634 Fix incorrect condition in SkipBuildingInstallers 2017-12-13 18:18:25 +01:00
Jan Vorlicek
1a22c5cb58 Cleanup the Dockerfile
Setting a user with admin rights is not needed for Alpine
2017-12-13 12:10:44 +01:00
Jan Vorlicek
1abd2d9209 Enable Alpine 3.6 CLI build
This change enables CLI build for Alpine 3.6 and also adds CI job for
it. It is mostly based on changes that were necessary to
enable building of rhel.6 CLI
2017-12-13 12:10:44 +01:00
Eric Erhardt
411b38b36d
Merge pull request #8223 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26012-06 (master)
2017-12-12 18:23:21 -06:00
Eric Erhardt
abc48496ee
Merge pull request #8225 from eerhardt/UnpinStage0
Bump stage0 to 2.2.0-preview1-007799.
2017-12-12 17:49:37 -06:00
John Luo
b3d565da56 Update to consume aspnetcore 2.0.5-142 2017-12-12 15:36:41 -08:00
Livar Cunha
0bc62bf6aa Merged PR 98143: Merge merge_release_21 to release/2.1-MSRC 2017-12-12 23:34:33 +00:00
Livar Cunha
a27354ba57 Merge branch 'release/2.1' into merge_release_21
* release/2.1:
  Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated
  Updating the branding of the CLI to 2.1.4
  Updating the msbuild version for Microsoft.Build.Runtime.
  Updating the websdk version to 2.0.0-rel-20171110-671

	build/DependencyVersions.props
2017-12-12 15:24:09 -08:00
Eric Erhardt
52a59dd56e Bump stage0 to 2.2.0-preview1-007799.
Need to remove some unnecessary dependencies in dotnet-cli-build.csproj because the NuGet.CommandLine.XPlat reference was bringing in an old MSBuild version, which was breaking restore. I didn't see any usages of this reference, so I'm removing it since it is not needed.
2017-12-12 17:16:25 -06:00
Livar
c335c4e3c8
Merge pull request #8220 from AndyGerlicher/MSBuild.15.6.22
MSBuild 15.6.22
2017-12-12 15:07:32 -08:00
dotnet-bot
3bdce29d27 Update CoreSetup to preview1-26012-06 2017-12-12 22:07:06 +00:00
Peter Huene
dcc99d6e33
Make restore performed by run command default to nologo and quiet.
This commit changes the run command such that it will now be `/nologo` and
`/verbosity:quiet` (by default) for the restore operation even if a target
framework is specified.

When a target framework is specified, a separate restore operation is performed
that does not pass `/nologo` and the default verbosity is used.  The fix is to
ensure that the arguments used for the restore operation match those that are
used for the build operation.

Fixes #8118.
2017-12-12 10:41:50 -08:00
Andy Gerlicher
d2985289fa MSBuild 15.6.22 2017-12-12 10:30:15 -08:00
Livar
d38c6000c1
Merge pull request #8199 from peterhuene/sln-write-bom
Write UTF-8 BOM for solution files.
2017-12-11 20:21:41 -08:00
John Beisner
94e43afa68 Use explict and non-preview versions for the build DLL 2017-12-11 16:54:35 -08:00
John Beisner
1772b81170
Merge pull request #8212 from johnbeisner/FixUpdateDependenciesScript
Fixing "update-dependencies" script
2017-12-11 16:40:49 -08:00
John Beisner
004d00b91e Formatting... 2017-12-11 14:45:06 -08:00
John Beisner
fd0e131ca0
Merge pull request #8210 from natemcmaster/dotnet-install
Correctly check for existence of shared runtime in dotnet-install scripts
2017-12-11 13:34:48 -08:00
John Beisner
b253a772f0 NuGet.Config is no longer present - therefore, explicitly state where to get this script's dependencies. 2017-12-11 13:04:41 -08:00
John Beisner
61bc1d82b4
Merge pull request #8211 from johnbeisner/FixMicrosoftBuildRuntime
Fixing NuGet reference to Microsoft.Build.Runtime
2017-12-11 12:31:56 -08:00
John Beisner
ed4413b9fb Fixing a typo... 2017-12-11 11:25:52 -08:00
John Beisner
3ac579997c
Merge pull request #8204 from johnbeisner/FixTheMerge
Fixing CLI:master - parameterizing 'GenerateInstallersAndCopyOutOfSandBox'
2017-12-11 11:21:39 -08:00
John Beisner
6313f4fc7a The 15.4.8 version of the Microsoft.Build.Runtime nuget package is currupt; use the replacement 15.4.8.1 2017-12-11 11:01:24 -08:00
Nate McMaster
2c931b810d Fix dotnet-install to check the right path for no-op installs when --shared-runtime is specified 2017-12-11 10:10:08 -08:00
Livar
80dda1955f
Merge pull request #8207 from mayankbansal018/updatetestsdk
Update preview of TestPlatform SDK
2017-12-11 09:52:21 -08:00
John Beisner
7a3dcee2aa Updated usage comments. 2017-12-11 08:12:45 -08:00
Mayank Bansal
ececae3ecd update preview of TestPlatform SDK 2017-12-11 19:40:10 +05:30
John Beisner
b06f6b1954 The target: 'GenerateInstallersAndCopyOutOfSandBox' should be parameterized in run-build.sh. 2017-12-10 18:12:20 -08:00
John Beisner
7726565e09
Merge pull request #8201 from johnbeisner/FixTheMerge
Fixing CLI:master - parameterizing the 'BuildAndPublishAllLinuxDistrosNativeInstallers'
2017-12-08 20:37:48 -08:00