Commit graph

666 commits

Author SHA1 Message Date
jbeisner
c6ccdb29fd Reacting to core-setup changes for 'DEB' distro agnostic installers; example: 'dotnet-runtime-2.1.0-preview1-26104-06-x64.deb'
Plus: Update CoreSetup to preview1-26105-01
2018-01-05 20:51:50 +00:00
Livar
7fec5c4a6a
Merge pull request #8323 from dotnet/nuget-insertbuild4782
Insert NuGet Build 4.6.0-rtm-4782 into cli
2018-01-03 16:18:05 -08:00
NuGet Team Bot
b5b105b47e Insert NuGet Build 4.6.0-rtm-4782 into cli 2018-01-03 15:20:05 -08:00
dotnet-bot
1661e8bace Update CoreSetup to preview1-26103-03 2018-01-03 22:19:42 +00:00
dotnet-bot
6d4078429c Update CoreSetup to preview1-26102-03 2018-01-02 22:15:32 +00:00
dotnet-bot
c9e884e355 Update CoreSetup to preview1-26102-01 2018-01-02 18:10:45 +00:00
dotnet-bot
93073360c7 Update CoreSetup to preview1-26023-01 2017-12-23 18:33:34 +00:00
dotnet-bot
e015abc219 Update CoreSetup to preview1-26022-04 2017-12-22 22:34:22 +00:00
NuGet Team Bot
1e216db126 Insert NuGet Build 4.6.0-preview2-4759 into cli 2017-12-21 15:35:32 -08:00
Livar
3c94774185
Merge pull request #8268 from dotnet/nuget-insertbuild4745
Insert NuGet Build 4.6.0-preview2-4745 into cli
2017-12-19 17:01:52 -08:00
Livar
2cd74779d1 Updating roslyn to a version with the vbcscompiler. (#8214) 2017-12-19 14:06:48 -08:00
NuGet Team Bot
5a52a063b8 Insert NuGet Build 4.6.0-preview2-4745 into cli 2017-12-19 09:01:28 -08:00
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
6ef4b794b2
Merge branch 'master' into merges/release/2.1-to-master-20171218-080046 2017-12-18 09:51:07 -08:00
dotnet-bot
7d968b0944 Update CoreSetup to preview1-26015-04 2017-12-15 22:28:58 +00:00
Livar
3cac822511
Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62414-02 2017-12-13 19:26:21 -08:00
dotnet-bot
8cbb59854e Update CoreSetup to preview1-26013-05 2017-12-13 22:11:47 +00:00
dotnet-bot
50f203396f Update CoreSetup to preview1-26013-04 2017-12-13 18:22:59 +00: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
dotnet-bot
3bdce29d27 Update CoreSetup to preview1-26012-06 2017-12-12 22:07:06 +00:00
Andy Gerlicher
d2985289fa MSBuild 15.6.22 2017-12-12 10:30:15 -08:00
Mayank Bansal
ececae3ecd update preview of TestPlatform SDK 2017-12-11 19:40:10 +05:30
Mike Lorbetske
5fb2b271a8 Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated 2017-12-08 12:52:48 -08:00
Livar
9c5843d071
Merge pull request #8165 from dotnet/vramak/UpdateWebSdk_12_4
Updating the websdk version to 2.0.0-rel-20171110-671
2017-12-07 14:35:01 -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
Livar Cunha
90e254b9ed More fixes that were missing from the merge. 2017-12-07 13:23:27 -08:00
Livar Cunha
902904cdd6 Updating the msbuild version for Microsoft.Build.Runtime. 2017-12-07 13:13:43 -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 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
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
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
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
Livar
b3d8bfca35
Merge pull request #8163 from dotnet/nguerrera/update-sdk
Update to latest dotnet/sdk
2017-12-04 16:27:28 -08:00
Vijay Ramakrishnan
11d9413b49 Updating the websdk version to 2.0.0-rel-20171110-671 2017-12-04 16:02:40 -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
John Beisner
80f5d9f8c7 Even more package dependency re-names... 2017-12-04 13:20:37 -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
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
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 Luo
9d391355f8 Consume 2.0.4 LZMA attempt 2 2017-12-01 10:54:49 -08:00
John Luo
6e41f29b38 Consume 2.0.4 LZMA 2017-11-30 16:43:20 -08:00
Parallels
83ddef69d6 Fixing the store consumption merge. 2017-11-30 14:15:38 -08:00
Livar
d48654afe7
Merge branch 'master' into merges/release/15.5-to-master-20171120-080035 2017-11-30 09:40:47 -08:00