Commit graph

698 commits

Author SHA1 Message Date
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
dotnet-bot
5e7b07c95a Update CoreSetup to preview1-25929-02 2017-11-29 19:57:20 +00:00
dotnet-bot
ed61cab7b6 Update CoreSetup to preview1-25929-01 2017-11-29 05:09:16 +00:00
dotnet-bot
bc7bcd3a1f Update CoreSetup to preview1-25928-05 2017-11-28 20:46:43 +00:00
Livar
df414ddcfa
Merge pull request #8112 from mlorbetske/dev/mlorbe/UpdateTheFixForBugs526577And526578For156
Correct the fix for devdiv bugs 526577 and 526578, the engine property had not been updated
2017-11-27 17:50:45 -08:00
Livar
4b297851e9
Merge pull request #8110 from dotnet/livarcocc-patch-2
Update SDK to 2.1.0-preview1-20171121-1
2017-11-27 16:13:40 -08:00
Livar
4debf0cd4b
Merge pull request #8091 from KevinRansom/UpdateFSharp
Update F# for VS2017.6
2017-11-27 14:31:15 -08:00
Mike Lorbetske
2714332d87 Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated 2017-11-27 14:22:11 -08:00
Mike Lorbetske
391d4362f3 Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated 2017-11-27 14:16:22 -08:00
Livar
093352bb66
Update SDK to 2.1.0-preview1-20171121-1 2017-11-27 14:16:10 -08:00
Livar Cunha
9e97e53446 Updating the CLI branding to 2.1.2 and ingesting the 2.0.4 runtime. 2017-11-27 11:36:12 -08:00
Nick Guerrera
68c8639f09
Merge pull request #8083 from nguerrera/update-satellites
Update F# and Roslyn translations
2017-11-27 10:20:57 -08:00
dotnet-bot
0b0ec007f8 Update CoreSetup to preview1-25926-02 2017-11-26 23:19:03 +00:00
Livar
469d6fb4df
Merge pull request #8094 from dotnet/merges/release/2.0.0-to-release/15.5-20171124-080040
Merge release/2.0.0 to release/15.5
2017-11-24 19:52:41 -08:00
dotnet-bot
ce96e03d1e Update CoreSetup to preview1-25924-02 2017-11-24 22:17:43 +00:00
dotnet-bot
c1c3cd4d24 Update CoreSetup to preview1-25923-01 2017-11-23 19:29:10 +00:00
Kevin Ransom
da8b3d3224 Update F# for VS2017.6 2017-11-22 20:09:47 -08:00
dotnet-bot
94fe8df9d2 Update CoreSetup to preview1-25922-04 2017-11-22 22:24:10 +00:00
Nick Guerrera
129b064900 Update F# and Roslyn translations 2017-11-21 17:02:26 -08:00
dotnet-bot
80f35f0ac8 Update CoreSetup to preview1-25921-02 2017-11-21 22:14:42 +00:00
Matt Mitchell
b7cc4a51b7
Update feed tasks version
Includes some fixes for upload timeouts and a version number change
2017-11-21 13:50:27 -08:00
Nick Guerrera
211255ec88 Revert "Update Roslyn and F# satellite assemblies"
This reverts commit f91a4906a7.
2017-11-21 10:43:26 -08:00
Nick Guerrera
f91a4906a7
Update Roslyn and F# satellite assemblies 2017-11-21 10:16:18 -08:00
dotnet-bot
6702ef401a Update CoreSetup to preview1-25921-01 2017-11-21 18:11:12 +00:00
Livar
01393ed3bc
Merge branch 'master' into merges/release/15.5-to-master-20171120-080035 2017-11-20 12:30:12 -08:00
Livar
2b55a52e33
Merge pull request #8057 from mlorbetske/dev/mlorbe/UpdateTemplateEngineVersionFor15.5
Update template engine version for 15.5
2017-11-20 11:50:43 -08:00
dotnet-bot
125514df02 Update CoreSetup to preview1-25919-02 2017-11-19 22:30:20 +00:00
Livar
d0b2b5f678
Merge pull request #8059 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25918-03 (master)
2017-11-18 13:56:17 -08:00
Livar
90d667e9b0
Merge pull request #8056 from mlorbetske/dev/mlorbe/UpdateTemplateEngineVersion
Update template engine version for 15.6+
2017-11-18 13:55:27 -08:00
dotnet-bot
d4df0010af Update CoreSetup to preview1-25918-03 2017-11-18 19:18:46 +00:00
Mike Lorbetske
d5c799b926 Update template engine version for 15.5 2017-11-17 18:40:33 -08:00
Mike Lorbetske
746b669a4c Update template engine version for 15.6+ 2017-11-17 18:37:56 -08:00
Livar
7e92f68b41
Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171117-080027 2017-11-17 18:26:30 -08:00
dotnet-bot
90a0249e00 Update CoreSetup to preview1-25917-06 2017-11-17 22:39:35 +00:00
Livar
d0c5510ee2
Merge pull request #7992 from seancpeters/templating_2.1.0-preview1_insertion_2017_11_09
Inserting dotnet/templating rel/2.1.0-preview1 into cli master
2017-11-16 18:27:28 -08:00
NuGet Team Bot
0cd05674ac Insert NuGet Build 4.5.0-rtm-4651 into cli 2017-11-16 16:43:21 -08:00
dotnet-bot
4498142bb5 Update CoreSetup to preview1-25916-02 2017-11-16 22:48:36 +00:00
Livar
09b2cd74c4
Merge pull request #8031 from AndyGerlicher/MSBuild.15.5.179
MSBuild 15.5.179
2017-11-16 11:55:46 -08:00
dotnet-bot
91bdd7e3a4 Update CoreSetup to preview1-25916-01 2017-11-16 18:45:07 +00:00
Andy Gerlicher
a75115f4f7 MSBuild 15.5.179 2017-11-15 18:05:25 -08:00
Livar
b7f81a574e
Update SDK to 15.5.0-preview-20171116-1 2017-11-15 17:14:17 -08:00
dotnet-bot
23575687f6 Update CoreSetup to preview1-25915-02 2017-11-15 23:44:19 +00:00
Livar Cunha
fe69088703 Updating Roslyn version. 2017-11-15 13:22:30 -08:00
dotnet-bot
1a16f3a7c5 Update CoreSetup to preview1-25915-01 2017-11-15 19:13:43 +00:00
Livar
46c55a322f
Merge pull request #8016 from livarcocc/merge_15_5_msrc
Merge release/15.5-MSRC into release/15.5
2017-11-15 09:49:19 -08:00
Livar
30329286d7
Merge pull request #8019 from KevinRansom/release/15.5
Update F# compiler
2017-11-14 18:54:51 -08:00
dotnet-bot
04c477fc21 Update CoreSetup to preview1-25914-05 2017-11-14 23:04:34 +00:00
Kevin Ransom (msft)
6fef644b70 Update F# compiler 2017-11-14 14:54:03 -08:00
Livar
c0488894b1
Merge pull request #8005 from mlorbetske/dev/mlorbe/UpdateForTestTemplates
Update non-web templates to version 1.0.0-beta3-20171110-312
2017-11-14 14:49:44 -08:00
Sean Peters
be0bebdf30 updated TemplateEnd template versions. Removed old entries from BundledTemplates.props 2017-11-14 14:13:31 -08:00
seancpeters
29a3673535
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09 2017-11-14 14:04:55 -08:00
Livar
3b4becd7c8
Merge pull request #8011 from dotnet/merges/release/15.5-to-master-20171114-080040
Merge release/15.5 to master
2017-11-14 12:58:56 -08:00
Livar Cunha
dc8a8e02db Merge branch 'release/2.0.0-MSRC' into merge_2_0_0_MSRC
* release/2.0.0-MSRC:
  Updating SDK to 2.0.3-servicing-20171109-3
  Update SDK to 2.0.2-vspre-20170927-1.
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
2017-11-14 12:51:43 -08:00
Livar Cunha
005eab5b3f Merge branch 'release/15.5-MSRC' into merge_15_5_msrc
* release/15.5-MSRC:
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
2017-11-14 12:47:53 -08:00
Livar
e5d2a67cfe
Merge pull request #7974 from singhsarab/patch-1
Updating the version for TestPlatform
2017-11-13 12:14:25 -08:00
Mike Lorbetske
5d85c8fde6 Update non-web templates to version 1.0.0-beta3-20171110-312 2017-11-13 12:02:34 -08:00
dotnet-bot
36d201b4f0 Update CoreSetup to preview1-25912-02 2017-11-12 22:48:10 +00:00
seancpeters
02e82d5610
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09 2017-11-10 17:28:33 -08:00
Sean Peters
b1c7c072b6 updated the websdk version 2017-11-10 17:21:37 -08:00
Sean Peters
a49a9680ff bumped the templating build number 2017-11-10 16:26:36 -08:00
Nick Guerrera
5d2c5f9943
Update SDK 2017-11-10 10:56:54 -08:00
Nick Guerrera
71cb608e48
Merge branch 'master' into merges/release/15.5-to-master-20171109-080038 2017-11-09 18:43:28 -08:00
Sean Peters
82718a146c Inserting dotnet/templating rel/2.1.0-preview1 into cli master 2017-11-09 15:46:14 -08:00
dotnet-bot
dfc674fb09 Update CoreSetup to preview1-25909-03 2017-11-09 22:44:46 +00:00
John Beisner
7b593a8ec6 Defining: "BuildTasksFeedToolVersion" 2017-11-08 19:42:41 -08:00
Livar Cunha
f85436d82d Updating SDK to 2.0.3-servicing-20171109-3 2017-11-08 19:16:27 -08:00
Livar Cunha
ef453ae64a Merge branch 'release/15.5' into merge_release_15_5
* release/15.5:
  Updating the SDK and Support package on the CLI
2017-11-08 18:04:43 -08:00
Jose Perez Rodriguez
079edcd894 Updating the SDK and Support package on the CLI 2017-11-08 15:31:51 -08:00
Livar Cunha
aa944444f6 Update SDK to 2.0.2-vspre-20170927-1. 2017-11-08 14:31:06 -08:00