Commit graph

7785 commits

Author SHA1 Message Date
John Beisner
02b1cc6aa7 'channel' parameter is superfluous if also using a 'version' parameter. 2017-12-08 17:49:38 -08:00
John Beisner
e69159a335 Fixing the comment. 2017-12-08 17:18:08 -08:00
John Beisner
21e9e7277a The first 'dotnet msbuild ' pass should not run 2 targets: /'WriteDynamicPropsToStaticPropsFiles' and 'BuildAndPublishAllLinuxDistrosNativeInstallers' 2017-12-08 17:06:36 -08:00
John Beisner
3bea47e1fe "${args[@]}" should be: $args
Reference: Jan Vorlicek did some work to enable RedHat6 and part of that work was to change the argument passing in bash.
2017-12-08 11:27:12 -08:00
Livar
977a6ec321
Merge pull request #8006 from javiercn/javiercn/aspnetcore-httpscertificate
ASP.NET Core HTTPS development certificate support
2017-12-07 15:52:47 -08:00
Javier Calvarro Nelson
ad8f3da826 ASP.NET Core HTTPS development certificate support
* Added support for generating the HTTPS development certificate on the
CLI first run experience.
* On first run, an HTTPS certificate will be set up on the current user
local store.
* The environment variable DOTNET_GENERATE_ASPNET_CERTIFICATE can be used
to turn the feature off.
2017-12-07 14:31:00 -08:00
Nick Guerrera
9e6e737519
Merge pull request #8146 from v-zbsail/localization
LOC CHECKIN | dotnet/cli-master | 20171201
2017-12-07 14:29:15 -08:00
Livar
661f004b16
Merge pull request #8173 from dotnet/merges/release/15.5-to-master-20171206-080040
Merge release/15.5 to master
2017-12-07 14:24:52 -08:00
Livar Cunha
90e254b9ed More fixes that were missing from the merge. 2017-12-07 13:23:27 -08:00
Livar Cunha
5a0e95897e Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171206-080040
* dotnet/release/15.5: (26 commits)
  Fixing the reference to Microsoft.Build.Runtime from Cli.Utils.Tests. It was using the wrong package version property.
  One more old style version package name needed to change in redist.
  Fixing the versions of MSBuild and passing the right property to find roslyn files.
  Use "15.5.179" for the other Microsoft.Build.* packages
  Moving the 'MicrosoftBuildPackageVersion' forward.
  Fixing "RuntimeFrameworkVersion"
  Updating version naming convention.
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.
  Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties.
  Changes per code review...
  ...

	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj
	build/BundledTemplates.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Test.targets
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	dir.props
	run-build.sh
	src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
	src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
	src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
	src/dotnet/dotnet.csproj
	src/redist/redist.csproj
	src/tool_fsharp/tool_fsc.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
	test/EndToEnd/EndToEnd.csproj
	test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
2017-12-07 09:55:12 -08:00
Livar
d1aed81276
Merge pull request #8171 from dotnet/merges/release/2.0.0-to-release/15.5-20171206-080037
Merge release/2.0.0 to release/15.5
2017-12-07 00:21:27 -08:00
Livar Cunha
0f8dfedc6f Fixing the reference to Microsoft.Build.Runtime from Cli.Utils.Tests. It was using the wrong package version property. 2017-12-06 23:06:43 -08:00
Livar Cunha
8b1c2c5026 One more old style version package name needed to change in redist. 2017-12-06 22:44:51 -08:00
Livar Cunha
d280a054d4 Fixing the versions of MSBuild and passing the right property to find roslyn files. 2017-12-06 22:14:02 -08:00
John Beisner
50dcb60025 Use "15.5.179" for the other Microsoft.Build.* packages 2017-12-06 15:18:38 -08:00
John Beisner
e3b78f8ea5 Moving the 'MicrosoftBuildPackageVersion' forward. 2017-12-06 14:59:38 -08:00
John Beisner
d61eb5de92 Fixing "RuntimeFrameworkVersion" 2017-12-06 12:48:45 -08:00
John Beisner
e09cbe0043 Updating version naming convention. 2017-12-06 12:41:08 -08:00
Livar Cunha
cd86a4cac4 Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171206-080037
* dotnet/release/2.0.0:
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_roslyn/tool_roslyn.csproj
2017-12-06 12:18:28 -08:00
John Beisner
5cea436e8f
Merge pull request #8170 from johnbeisner/AddNugetFeed
Adding a 'nuget-build' feed.
2017-12-05 16:16:51 -08:00
John Beisner
873f0791fb Fixing a typo... 2017-12-05 14:14:02 -08:00
John Beisner
174c9ff60e
Merge pull request #8152 from johnbeisner/ConfigNuget
Dependency Uptake: CLI - part 2
2017-12-05 11:14:18 -08:00
John Beisner
73e8ea9c1c Adding a 'nuget-build' feed; fixing the feed line-up: 'dotnet-core' and 'AspNetMaster'. 2017-12-05 10:33:36 -08:00
Livar
f2463fe2a5
Merge pull request #8164 from seancpeters/templating_build_315_insertion
Update template engine to build 315
2017-12-05 09:34:36 -08:00
Livar
f140bb4d01
Merge pull request #8167 from dotnet/merges/release/2.0.0-to-release/15.5-20171205-080034
Merge release/2.0.0 to release/15.5
2017-12-05 09:34:14 -08:00
Livar
c77452b9e2
Merge pull request #8158 from dotnet/merges/release/15.5-to-master-20171204-080035
Merge release/15.5 to master
2017-12-05 09:34:02 -08:00
John Beisner
fba1ad7287 Fixed a typo... 2017-12-05 09:19:22 -08:00
Livar
b3d8bfca35
Merge pull request #8163 from dotnet/nguerrera/update-sdk
Update to latest dotnet/sdk
2017-12-04 16:27:28 -08:00
John Beisner
1c5b49baee Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop 2017-12-04 14:32:56 -08:00
William Lee
55f62d9d64
Add install tool command (#8132)
* compose all the parts

* Fix on obtain and shim maker for better end to end experience
  * Fix error when there is space in the middle of path of nuget config
  * Fix path in profile.d is the tmp home path during install
  * better handle of ~home
  * remove profile.d file in uninstall script
  * Fix test since it looks up current directory
  * folder structure inside nupkg to tools/TFM/RID/mytool.dll
  * Add check for config file existence
  * Rename name space to Microsoft.DotNet.ShellShim
  * Rename name space to Microsoft.DotNet.ToolPackage
2017-12-04 14:13:24 -08:00
Nick Guerrera
e0931a7b36 Update xlf 2017-12-04 13:37:55 -08:00
John Beisner
2cdb5a9f7e
Merge pull request #8119 from natemcmaster/install-script
Add parameter to dotnet-install to support pulling from private blob feeds
2017-12-04 13:28:08 -08:00
John Beisner
f7947a13d3
Merge pull request #8120 from natemcmaster/install-script2
Pipe ldconfig stderr to /dev/null
2017-12-04 13:27:52 -08:00
John Beisner
80f5d9f8c7 Even more package dependency re-names... 2017-12-04 13:20:37 -08:00
Nick Guerrera
100a334e70 Merge branch 'master' into v-zbsail-localization 2017-12-04 13:19:38 -08:00
Sean Peters
e2ea046082 Update template engine to build 315 2017-12-04 13:09:05 -08:00
Mihai Codoban
ea74bf1614 Bump MSbuild to 15.6.0-preview-000012-1193158 (#8161)
Includes https://github.com/Microsoft/msbuild/pull/2716
2017-12-04 13:08:18 -08:00
Nick Guerrera
1fe2fb3003
Update to latest dotnet/sdk 2017-12-04 13:06:42 -08:00
Livar
0886e94071
Merge pull request #8135 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26001-02 (master)
2017-12-04 12:18:15 -08:00
Livar
0ca9728098
Merge branch 'master' into merges/release/15.5-to-master-20171204-080035 2017-12-04 11:20:08 -08:00
John Beisner
3cb1cca44d Third pass clean-up of package names. 2017-12-04 09:44:51 -08:00
John Beisner
4d694d2c56 Second pass clean-up of package names; resequencing download. 2017-12-04 09:31:28 -08:00
William Lee
bf6b5b3773
Use rhel docker image with sudo built in (#8151)
So we do not need to download sudo from the internet everytime we build
2017-12-03 10:15:44 -08:00
John Beisner
f0abfb6b12 Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props 2017-12-01 20:07:48 -08:00
dotnet-bot
667f27cac8 Update CoreSetup to preview1-26001-02 2017-12-01 22:20:50 +00:00
John Beisner
1362c6c4f1 The access key is already resolved: 'CoreSetupBlobAccessTokenParam' 2017-12-01 14:06:06 -08:00
John Beisner
5607d1f68c Fixed another typo... 2017-12-01 14:01:07 -08:00
John Beisner
0f7783f72b Fixed typo... 2017-12-01 13:59:25 -08:00
John Beisner
36e47bf417
Merge pull request #8140 from johnbeisner/ConfigNuget
Dependency Uptake: CLI - part 1
2017-12-01 13:31:39 -08:00
John Beisner
165f7c4575 The first pass will need the extra args [same as run-build.ps1]. 2017-12-01 12:40:40 -08:00