mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9225 commits 41 branches 190 tags 95 MiB
Commit graph

1093 commits

Author SHA1 Message Date
Livar Cunha
0be7da612c Updating Roslyn to 2.7.0-beta3-62529-06. 2018-01-29 14:20:16 -08:00
Livar Cunha
6fd727b646 Updating Roslyn to 2.7.0-beta3-62529-05. 2018-01-29 14:16:51 -08:00
Vijay Ramakrishnan
c20517094d Updating the WebSdk DependencyVersion to support local build 2018-01-26 18:12:54 -08:00
Livar
0055785280
Merge pull request #8476 from dotnet/nuget.client.release-4862-1-1 
Insert NuGet Build 4.6.0-rtm-4862 into cli
 2018-01-26 14:55:55 -08:00
Kevin Ransom
e6c8fa6cdd Update fsharp compiler to match preview 4 2018-01-25 18:13:02 -08:00
John Luo
264f9a8d3f Update to consume aspnetcore 2.0.6-10008 notimestamp build 2018-01-25 14:45:17 -08:00
NuGet Team Bot
ef6e049f27 Insert NuGet Build 4.6.0-rtm-4862 into cli 2018-01-25 13:17:38 -08:00
John Luo
88f10b47ee Update to consume aspnetcore 2.0.6-10008 timestamp build 2018-01-25 13:01:48 -08:00
Andy Gerlicher
46f55c34c6 MSBuild 15.6.70 2018-01-25 12:57:10 -08:00
Peter Huene
394cb08b67
Merge branch 'release/2.1' into release/2.1-MSRC 
* release/2.1:
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
 2018-01-25 11:48:52 -08:00
Livar Cunha
067f98e7e9 Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake. 2018-01-24 21:47:05 -08:00
NuGet Team Bot
352a99b38e Insert NuGet Build 4.6.0-rtm-4859 into cli 2018-01-24 18:06:07 -08:00
Andy Gerlicher
e55de710cb MSBuild 15.6.69 2018-01-24 09:14:40 -08:00
Livar Cunha
2f72ec67d7 Merge branch 'release/2.1' into merge_release_21 
* release/2.1:
  Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
 2018-01-23 18:50:34 -08:00
Kevin Ransom
d41b99205a update fsharp compiler to match vs2017.6 preview 3 2018-01-23 13:50:44 -08:00
John Luo
3c2e78a403 Update to consume aspnetcore 2.0.6-10007 2018-01-22 15:26:02 -08:00
William Lee
e317925977
Merge pull request #8435 from dotnet/nuget-insertbuild4846 
Insert NuGet Build 4.7.0-preview1-4846 into cli
 2018-01-19 15:25:28 -08:00
NuGet Team Bot
47758a4ec2 Insert NuGet Build 4.7.0-preview1-4846 into cli 2018-01-19 14:32:57 -08:00
Nate McMaster
67f98be680 Update to aspnetcore 2.1.0-preview1-28124 2018-01-19 13:17:54 -08:00
NuGet Team Bot
b0cfb18501 Insert NuGet Build 4.7.0-preview1-4839 into cli 2018-01-18 17:47:41 -08:00
NuGet Team Bot
d0cdc9c266 Insert NuGet Build 4.6.0-rtm-4825 into cli 2018-01-18 16:13:18 -08:00
Tanner Gooding
603240f26d Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue 2018-01-18 14:03:25 -08:00
Livar
0ca4e2c47b
Merge pull request #8355 from dotnet/nuget-insertbuild4791 
Insert NuGet Build 4.6.0-rtm-4791 into cli
 2018-01-18 13:51:35 -08:00
Tanner Gooding
c5cf9994e2 Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue 2018-01-18 12:15:22 -08:00
Peter Huene
3c1911bd67
Update runtime and branding to 2.0.6. 2018-01-18 11:10:25 -08:00
John Beisner
be6f56425f
Merge pull request #8412 from johnbeisner/OrchestratedBuild 
Orchestrated build publishing; CLI:master
 2018-01-17 10:22:43 -08:00
Livar
2efe8f8360
Merge pull request #8410 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-26116-04 (master)
 2018-01-17 09:23:43 -08:00
Andy Gerlicher
b1b70292ce MSBuild 15.6.54 2018-01-16 21:31:49 -08:00
jbeisner
3386db7bed Create a manifest if performing an orchestrated build publish. 2018-01-17 02:36:50 +00:00
dotnet-bot
fef6d9bcd5 Update CoreSetup to preview1-26116-04 2018-01-16 22:56:00 +00:00
William Li
6d73caa31a Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62516-03 2018-01-16 14:28:17 -08:00
jbeisner
1acb93f15a Merge remote-tracking branch 'upstream/master' into OrchestratedBuild 2018-01-16 22:19:58 +00:00
jbeisner
9dc9f4c87b Use "PushToBlobFeed" instead of "UploadToAzure" 2018-01-16 22:16:56 +00:00
Livar
9881b8d745
Merge pull request #8396 from AndyGerlicher/MSBuild15.6.54 
MSBuild 15.6.54
 2018-01-16 12:13:57 -08:00
dotnet-bot
a1a1c2b762 Update CoreSetup to preview1-26115-03 2018-01-15 18:51:25 +00:00
Andy Gerlicher
af8ea2ffb7 MSBuild 15.6.54 2018-01-13 23:22:34 -08:00
Matt Mitchell
2cfc65a0c4
Merge pull request #8388 from johnbeisner/OrchestratedBuildPublishing 
Enabling the publish of CLI assets to 'orchestrated' blob storage.
 2018-01-12 19:33:28 -08:00
jbeisner
429f2fde07 Found a version of 'microsoft.dotnet.build.tasks.feed' that supports both parsing of the URL and the currrent Nupkg upload method: 2.1.0-prerelease-02312-02 2018-01-13 02:46:14 +00:00
Livar
a4afbc9f1f
Updates the TestPlatform to 15.6.0-preview-20180109-01 2018-01-12 15:47:42 -08:00
Livar
da40320229
Merge pull request #8346 from rainersigwald/msbuild-15.6.44 
MSBuild 15.6.44
 2018-01-12 15:45:35 -08:00
dotnet-bot
0354166e05 Update CoreSetup to preview1-26112-04 2018-01-12 22:43:35 +00:00
Livar
bd9d71d71c
Merge pull request #8249 from joperezr/BindingRedirects471 
Update the support package on the CLI to fix binding redirects on 4.7.1
 2018-01-12 11:42:45 -08:00
dotnet-bot
745e40b77d Update CoreSetup to preview1-26111-03 2018-01-11 20:55:02 +00:00
dotnet-bot
0f1fca5601 Update CoreSetup to preview1-26110-02 2018-01-10 23:04:12 +00:00
Nate McMaster
3e05d2495a Update to aspnetcore 2.1.0-preview1-28042 
- Update to 2.1.0-preview1-28042
 - Remove references to the aspnetcore-store package
 - Allow pulling aspnetcore from orchestrated build
 2018-01-10 09:05:49 -08:00
Livar
3f70aa89b1
Merge pull request #8353 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-26109-02 (master)
 2018-01-09 21:01:16 -08:00
Livar
e9d1d025de
Merge pull request #8341 from natemcmaster/aspnetcore-sharedfx 
Update to ASP.NET Core shared framework 2.1.0-preview1-28031
 2018-01-09 18:57:13 -08:00
NuGet Team Bot
168bbff95d Insert NuGet Build 4.6.0-rtm-4791 into cli 2018-01-09 16:58:29 -08:00
dotnet-bot
5bd7e6f4cb Update CoreSetup to preview1-26109-02 2018-01-09 22:50:08 +00:00
Livar Cunha
6f46ea928a Merge branch 'release/2.1-MSRC' into merge_release_21_msrc 
* release/2.1-MSRC:
  Update to consume aspnetcore 2.0.5-155
  Update to consume aspnetcore 2.0.5-152
  Revert "Update to consume aspnetcore 2.0.5-152"
  Update to consume aspnetcore 2.0.5-152
  Commit to trigger a rebuild of the CLI because of a build in place from the Runtime.
  Adding the 2.0.3 asp.net store to the native installer tests.
  Update to consume aspnetcore 2.0.5-147
  Update to consume aspnetcore 2.0.5-146
  Updating the runtime to 2.0.5.
  Update to consume aspnetcore 2.0.5-142
  Fixing the expected fx-version.
  Adding a separate dependency version for Microsoft.Build.Runtime.
  Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5.

 Conflicts:
  build/DependencyVersions.props
 2018-01-09 12:49:58 -08:00
dotnet-bot
aa3394ce26 Update CoreSetup to preview1-26109-01 2018-01-09 19:01:16 +00:00
Nate McMaster
ec3332d41e Update to 2.1.0-preview1-28031 and debian-agnostic aspnet installers 2018-01-09 09:17:15 -08:00
Livar
cee1044493
Merge branch 'release/2.1' into BindingRedirects471 2018-01-09 08:49:08 -08:00
Rainer Sigwald
3818828bf0 MSBuild 15.6.44 2018-01-09 09:49:31 -06:00
dotnet-bot
73b55ecd42 Update CoreSetup to preview1-26108-03 2018-01-08 22:18:39 +00:00
Livar
863787be75
Merge pull request #8335 from mlorbetske/dev/mlorbe/UpdateTemplatePackageVersionsFor21 
Update template package versions for 2.1 class, console, test and item templates
 2018-01-08 14:12:29 -08:00
Nate McMaster
c46f603dbb Update to aspnetcore 2.1.0-preview1-28006 2018-01-06 12:08:05 -08:00
Nate McMaster
fb2df937fe Replace aspnetcore-store with the aspnetcore-runtime 
Update downloaded installers and wixlib to pull the ASP.NET Core Runtime (aka shared framework)
 2018-01-05 19:31:24 -08:00
Nate McMaster
e914370606 Update templates package version 2018-01-05 19:29:55 -08:00
Nate McMaster
b6b53f1e55 Update dev-certs version 2018-01-05 19:29:55 -08:00
Livar Cunha
e329e0694f Fixing redist to use the new way to consume roslyn. I merged it wrong before. 2018-01-05 15:56:15 -08:00
dotnet-bot
a5c35aeadb Update CoreSetup to preview1-26105-02 2018-01-05 22:45:37 +00:00
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
Mike Lorbetske
b70fcc4ec6 Update template package versions for 2.1 class, console, test and item templates 2018-01-05 12:36:19 -08: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
Livar Cunha
3d92e52234 Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/2.1-20180103-080038 
* dotnet/release/2.0.0: (32 commits)
  Update wix version (#8313)
  Use explict and non-preview versions for the build DLL
  Fixing a typo...
  The 15.4.8 version of the Microsoft.Build.Runtime nuget package is currupt; use the replacement 15.4.8.1
  Fix dotnet-install to check the right path for no-op installs when --shared-runtime is specified
  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...
  The URL root will include the "dotnet" container; the structure will be identical after the "dotnet" container.
  No passwords should be in the open as environmental variables.
  ...

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_msbuild/tool_msbuild.csproj
	src/tool_roslyn/tool_roslyn.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
 2018-01-03 16:16:41 -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
John Luo
8c93b6d960 Update to consume aspnetcore 2.0.5-155 2017-12-20 19:25:45 -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
John Luo
ed511c4e29 Update to consume aspnetcore 2.0.5-152 2017-12-19 15:19:20 -08:00
John Luo
7af8cd0ae2 Revert "Update to consume aspnetcore 2.0.5-152" 
This reverts commit 559d880cc2.
 2017-12-19 15:18:35 -08:00
John Luo
559d880cc2 Update to consume aspnetcore 2.0.5-152 2017-12-19 15:17:03 -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
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
3cac822511
Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62414-02 2017-12-13 19:26:21 -08:00
John Luo
34ec8c2480 Update to consume aspnetcore 2.0.5-146 2017-12-13 16:45:48 -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
Livar Cunha
ed916733ee Updating the runtime to 2.0.5. 2017-12-13 09:27:06 -08: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
John Luo
b3d565da56 Update to consume aspnetcore 2.0.5-142 2017-12-12 15:36:41 -08: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
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
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
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
60ba27d2db Adding a separate dependency version for Microsoft.Build.Runtime. 2017-12-07 12:19: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 Cunha
0c97a82d92 Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5. 2017-12-04 21:23:14 -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
Livar Cunha
cdefd5d7aa Merge branch 'release/15.5' into release/15.5-MSRC 
* release/15.5:
  Update SDK to 15.5.0-preview-20171107-4
  MSBuild 15.5.178
  LOC CHECKIN | dotnet/cli - release/15.5 | 20171031
 2017-11-08 13:14:44 -08:00
Livar
b6bfc84f51
Update SDK to 15.5.0-preview-20171107-4 2017-11-07 15:54:43 -08:00
dotnet-bot
fd738184c1 Update CoreSetup to preview1-25907-02 2017-11-07 17:49:55 +00:00
Sarabjot Singh
7dc7990d81
Updating the version for TestPlatform 
Includes branding changes
 2017-11-07 18:19:02 +05:30
Andy Gerlicher
ed916bb13e MSBuild 15.5.178 2017-11-06 19:23:10 -08:00
Livar
1f423ff22b
Update runtime version to preview1-25905-03 2017-11-06 09:31:45 -08:00
Livar Cunha
0ffc530aee Merge branch 'release/2.0.0-MSRC' into merge_release_200_MSRC 
* release/2.0.0-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-03 09:58:08 -07:00
Livar
3056f94cdf
Merge branch 'master' into merges/release/15.5-to-master-20171103-070036 2017-11-03 09:52:13 -07:00
Livar Cunha
6d16f2681e Merge branch 'release/2.0.0' into merge_release_200 
* release/2.0.0:
  Update F# compiler to match VS
  update fsharp compiler for preview release
  Defining the published Nupkgs in one place.
  Adding the second CLI NuPkg
  Make the uploads to blob storage more exacting.
  Enabling the publish of CLI NuPkg to the unified Transport feed.
 2017-11-03 09:46:25 -07:00
dotnet-bot
d4f92aa0f0 Update CoreSetup to preview1-25902-04 2017-11-03 00:57:00 +00:00
Livar
4122a72690
Merge pull request #7955 from dotnet/merges/release/15.5-to-master-20171102-070037 
Merge release/15.5 to master
 2017-11-02 09:32:40 -07:00
Andy Gerlicher
ec1e490395 MSBuild 15.5.172 2017-11-01 15:27:15 -07:00
Livar
2031c9cf33
Merge branch 'master' into merges/release/15.5-to-master-20171031-070033 2017-10-31 10:15:11 -07:00
Nate McMaster
255e7bc850 Update aspnetcore to 2.0.3 build 125 2017-10-31 09:10:35 -07:00
Satya Madala
e7fc8749f3 Insert Testplatform 15.5.0-preview-20171031-01 2017-10-31 20:46:45 +05:30
dotnet-bot
c59ad5a4c6 Update CoreSetup to preview1-25830-04 2017-10-30 23:00:25 +00:00
Livar
3d8ce7574b
Merge pull request #7900 from dotnet/merges/release/15.5-to-master-20171025-065942 
Merge release/15.5 to master
 2017-10-30 10:56:28 -07:00
Livar
d1b1454976
Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171030-065952 2017-10-30 09:40:54 -07:00
Kevin Ransom
8a60d17f0c Update F# compiler to match VS 2017-10-27 15:00:25 -07:00
William Lee
812cfbe90c
Update SDK version to 15.5.0-preview-20171027-2 (#7925) 2017-10-27 12:29:19 -07:00
Livar Cunha
dfd20eaf30 Updating the version of the command line parser. 2017-10-27 11:17:18 -07:00
Nate McMaster
878532eedf Update aspnetcore to 2.0.3 build 124 2017-10-27 07:57:14 -07:00
Livar
954b9a3ee1 Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-26 15:13:01 -07:00
Andy Gerlicher
4c804c3421 MSBuild 15.5.170 2017-10-26 12:46:37 -07:00
dotnet-bot
7d3ac35d84 Update CoreSetup to preview1-25825-07 2017-10-25 22:19:32 +00:00
Livar
103a56803f Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-25 10:46:31 -07:00
Nate McMaster
347169e68a Update aspnetcore to 2.0.3 build 123 2017-10-24 15:27:08 -07:00
Andy Gerlicher
f81c0fc1d7 MSBuild 15.5.165 2017-10-23 14:59:24 -07:00
Kevin Ransom
6ef8af7d6d update fsharp compiler for preview release 2017-10-23 14:47:31 -07:00
dotnet-bot
fa2bd27688 Update CoreSetup to preview1-25823-01 2017-10-23 17:28:38 +00:00
Nate McMaster
be1b014c7c Update aspnetcore runtime store and LZMA to 2.0.3 build 120 2017-10-20 08:59:31 -07:00
Livar
0d51d3d0f7 Merge branch 'master' into master-UpdateDependencies 2017-10-18 20:16:33 -07:00
dotnet-bot
5537be658f Update CoreSetup to preview1-25818-02 2017-10-18 21:35:19 +00:00
Livar
aad235fd1c Merge branch 'master' into merges/release/15.5-to-master-20171018-070036 2017-10-18 12:20:03 -07:00
dotnet-bot
8b69a7506a Update CoreSetup to preview1-25818-01 2017-10-18 17:45:51 +00:00
Livar
d3098e7fcd Update SDK to 15.5.0-preview-20171018-2 2017-10-18 10:40:15 -07:00
Livar Cunha
72eda50303 Merge branch 'release/2.0.0' into merge_release_200 
* release/2.0.0:
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
 2017-10-17 17:30:58 -07:00
Livar
9bd976f5ec Updating ASP.NET templates to 1.0.0-beta2-20170810-304 2017-10-17 16:52:20 -07:00
Livar
730affa440 Merge branch 'master' into master-UpdateDependencies 2017-10-17 16:26:04 -07:00
Livar
a34ecdeff6 Merge branch 'master' into merges/release/15.5-to-master-20171016-070031 2017-10-17 14:42:15 -07:00
dotnet-bot
3484dd26df Update CoreSetup to preview1-25817-05 2017-10-17 21:40:36 +00:00
Livar
966e133565 Merge branch 'master' into merges/release/15.5-to-master-20171016-070031 2017-10-17 11:36:43 -07:00
dotnet-bot
a6b40da4ae Update CoreSetup to preview1-25817-01 2017-10-17 17:50:35 +00:00
Livar
95dafad76b Merge branch 'release/15.5' into update_roslyn 2017-10-17 10:09:24 -07:00
Livar
c4faa28ffa Merge pull request #7847 from AndyGerlicher/MSBuild.15.5.160 
MSBuild 15.5.160
 2017-10-17 09:50:22 -07:00
Livar Cunha
ea158bb686 Update the roslyn version to 2.6.0-beta2-62210-01. 2017-10-17 09:48:16 -07:00
Daniel Plaisted
2a3a5be07d Insert SDK 15.5.0-preview-20171017-1 2017-10-16 17:23:12 -07:00
Livar
9de48be817 Merge pull request #7834 from harshjain2/TPv2LatestRelease 
Updated version of TestPlatform to 15.5.0-preview-20171012-09
 2017-10-16 15:52:49 -07:00
Livar Cunha
e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031 
* dotnet/release/15.5: (21 commits)
  Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  Use same build number for roslyn and F# satellites
  Updating Roslyn satellites and SDK versions
  Insert NuGet Build 4.5.0-preview2-4529 into cli
  Update NuGet to 4529 (signed)
  MSBuild 15.5.154
  MSBuild 15.5.153
  removed commented out config I'd meant to remove
  added a way to specify the asp.net template versions
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Fixed tests
  Update branch info to release/15.5
  Updating the websdk version to 2.0.0-rel-20171010-665
  Insert NuGet Build 4.5.0-preview1-4526 into cli
  Update DependencyVersions.props
  Updated version of TestPlatform to 15.5.0-preview-20170923-02
  MSBuild 15.4.8
  ...
 2017-10-16 15:42:40 -07:00
Andy Gerlicher
88bcf0ffb3 MSBuild 15.5.160 2017-10-16 14:40:46 -07:00
dotnet-bot
1efa3f57ad Update CoreSetup to preview1-25816-02 2017-10-16 21:38:06 +00:00
Livar
80d76f93a4 Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171013-070028 2017-10-13 10:19:11 -07:00
Livar Cunha
27aa698710 Manually merging some changes that git merged wrong and deleted from the 15.5 branch. 2017-10-13 09:56:08 -07:00
Livar Cunha
1943ddc57f Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171013-070028 
* dotnet/release/2.0.0:
  Use temporary path for fake deps.json in test
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Keeping the branding for release/2.0.0 at 2.0.3.
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
 2017-10-13 09:04:58 -07:00
Harsh Jain
41d1f6ad6d Updated version of TPv2 2017-10-13 14:09:32 +05:30
Nick Guerrera
c0c4be7946 Merge branch 'release/2.0-vs' into merge-2.0-vs 2017-10-12 18:22:04 -07:00
Nick Guerrera
7b558111ae Use same build number for roslyn and F# satellites 2017-10-12 16:22:06 -07:00
Livar Cunha
f6a07bcb39 Merge branch 'release/2.0.0' into merge_release_200 
* release/2.0.0:
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Update cli-deps-satellites
  Fix up roslyn satellite assembly handling to match new insertion mechanism
 2017-10-12 14:56:23 -07:00
Livar
428b2caa6b Merge pull request #7814 from AndyGerlicher/MSBuild.15.5.154 
MSBuild 15.5.154
 2017-10-12 13:51:38 -07:00
Livar
278cbf6c44 Merge pull request #7819 from dotnet/livarcocc-patch-2 
Updating Roslyn satellites and SDK versions
 2017-10-11 23:54:09 -07:00
Livar
821a413dd6 Updating Roslyn satellites and SDK versions 2017-10-11 22:29:40 -07:00
NuGet Team Bot
15ee853d49 Insert NuGet Build 4.5.0-preview2-4529 into cli 2017-10-11 18:44:34 -07:00
Livar
95a56ffcfe Merge pull request #7811 from seancpeters/15.5_separate_aspnet_templates 
Added a property to DependencyVersions.props for asp.net template version
 2017-10-11 18:40:24 -07:00
Andy Gerlicher
d15d448332 Update NuGet to 4529 (signed) 2017-10-11 18:30:57 -07:00
Andy Gerlicher
97f4a01869 MSBuild 15.5.154 2017-10-11 17:27:36 -07:00
Andy Gerlicher
3b09db3f9e MSBuild 15.5.153 2017-10-11 17:26:43 -07:00
seancpeters
c6139adcc9 added a way to specify the asp.net template versions 2017-10-11 16:22:03 -07:00
faahmad
6f41ca4de7 Merge branch 'release/15.5' into updateTpv215.5.0-preview-20171009-10 
# Conflicts:
#	build/DependencyVersions.props
 2017-10-11 12:09:40 +05:30
Livar
7f5c9ec12a Merge pull request #7803 from dotnet/vramak/websdk_15_5 
Updating the websdk version to 2.0.0-rel-20171010-665
 2017-10-10 21:07:53 -07:00
Vijay Ramakrishnan
6a116d4b94 Updating the websdk version to 2.0.0-rel-20171010-665 2017-10-10 16:38:32 -07:00
dotnet-bot
ce29ec42e8 Update CoreSetup to preview1-25810-02 2017-10-10 22:28:57 +00:00
NuGet Team Bot
a084153c15 Insert NuGet Build 4.5.0-preview1-4526 into cli 2017-10-10 15:08:33 -07:00
Shyam-Gupta
b5d9f6f3e6 Update DependencyVersions.props 2017-10-10 16:50:09 +05:30
Livar Cunha
fead8521c3 Moving the runtime version to 2.0.0 for the SDK. 
(cherry picked from commit e24b53dda7)
 2017-10-09 13:59:09 -07:00
Nick Guerrera
ddae0875cf Revert release/2.0.0 back to 1bcee43995 
There were incorrect merges from release/15.5 to release/2.0.0 since then
 2017-10-09 13:55:13 -07:00
Livar Cunha
7ce43b9e3e Updating the runtime version. 2017-10-09 11:42:21 -07:00
Shyam-Gupta
9a2e87f0d9 Updated version of TestPlatform to 15.5.0-preview-20170923-02 
refer commit: fa876f5b90
 2017-10-09 17:46:08 +05:30
dotnet-bot
c23cd33b28 Update CoreSetup to preview1-25806-02 2017-10-06 22:06:36 +00:00
Eric Erhardt
a629d569a3 Merge pull request #7780 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25806-01 (master)
 2017-10-06 16:17:16 -05:00
Livar
5407978c13 Merge pull request #7772 from dotnet/livarcocc-patch-2 
Update the SDK to 2.1.0-preview1-20171006-4
 2017-10-06 11:49:05 -07:00
dotnet-bot
6066e1ce3a Update CoreSetup to preview1-25806-01 2017-10-06 17:40:13 +00:00
Livar
c950f92462 Update the SDK to 2.1.0-preview1-20171006-4 2017-10-05 16:39:32 -07:00
dotnet-bot
ad0ecd6914 Update CoreSetup to preview1-25805-02 2017-10-05 21:39:21 +00:00
Nick Guerrera
d0013186c7 Merge pull request #7751 from nguerrera/fixup-roslyn-loc 
Update satellite assemblies and fix up roslyn satellite handling
 2017-10-05 11:25:07 -07:00
dotnet-bot
58c76ff1ce Update CoreSetup to preview1-25804-01 2017-10-04 17:28:30 +00:00
Livar Cunha
e24b53dda7 Moving the runtime version to 2.0.0 for the SDK. 2017-10-03 16:46:15 -07:00
Nick Guerrera
cd68283018 Update cli-deps-satellites 2017-10-03 16:01:08 -07:00
Livar
2d3b8da0b0 Merge pull request #7748 from AndyGerlicher/MSBuild.15.5.113 
MSBuild 15.5.113
 2017-10-03 09:55:17 -07:00
Livar
72f42f9463 Merge pull request #7735 from brettfo/update-fsharp-15.5 
Update FSharp compiler
 2017-10-02 20:43:11 -07:00
Andy Gerlicher
cd9260f467 MSBuild 15.5.113 2017-10-02 19:03:59 -07:00
Brett V. Forsgren
6ccff28e0a Update F# compiler 2017-10-02 16:37:31 -07:00
dotnet-bot
ee76f981b4 Update CoreSetup to preview1-25802-02 2017-10-02 22:30:41 +00:00
Livar
32c0f44129 Merge branch 'release/15.5' into improve_roslyn 2017-10-02 15:13:34 -07:00
dotnet-bot
1bf3b681e2 Update CoreSetup to preview1-25802-01 2017-10-02 17:27:49 +00:00
khyperia
04c8a68539 Improve the way Roslyn is pulled in 2017-10-02 08:01:44 -07:00
dotnet-bot
49794cf29b Update CoreSetup to preview1-25801-01 2017-10-01 18:39:18 +00:00
dotnet-bot
ce08614bf7 Update CoreSetup to preview1-25729-02 2017-09-29 21:49:46 +00:00
Andy Gerlicher
fb67e25cfb MSBuild 15.5.110 2017-09-29 13:31:56 -07:00
dotnet-bot
8632acb6f7 Update CoreSetup to preview1-25728-02 2017-09-28 21:26:29 +00:00
Livar
b7f14949cd Merge pull request #7719 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25727-05 (master)
 2017-09-27 20:12:13 -07:00
Livar
5de69a9e0e Merge branch 'master' into merges/release/2.0.0-to-master-20170927-070027 2017-09-27 16:21:19 -07:00
dotnet-bot
05b0a63044 Update CoreSetup to preview1-25727-05 2017-09-27 22:49:00 +00:00
Livar Cunha
4bd9bb92cc Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170927-070027 
* dotnet/release/2.0.0: (29 commits)
  Updating the CLI branding to 2.0.3
  Fixing merges.
  Removing the trailing '\r' for bash shells; commit hash.
  Removing the trailing '\r' for bash shells. https://github.com/dotnet/cli/issues/7392
  Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version.
  Fixing 'librarypath'
  Update the installation scripts in release/2.0.0 branch.
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  Updating the websdk version to 2.0.0-rel-20170908-653
  Insert NuGet Build 4.4.0-preview3-4475 into cli
  Remove out of support ubuntu1610
  Removing extra line feeds...
  Turning on the NuPkg publishing from Win x86
  The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
  Trivial change to start a VSO build
  Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
  Remove EOL openSuSE 42.1
  Trigger build
  ...
 2017-09-27 14:35:00 -07:00
Andy Gerlicher
79077b5ea2 MSBuild 15.4.8 2017-09-27 09:52:43 -07:00
Daniel Plaisted
0d233cd9d0 Insert SDK 2.0.2-vspre-20170927-1 2017-09-26 18:13:03 -07:00
Livar Cunha
2669306319 Fixing merges. 2017-09-26 15:33:17 -07:00
Harsh Jain
fa876f5b90 Updated version of TestPlatform to 15.5.0-preview-20170923-02 2017-09-26 19:19:16 +05:30
Livar Cunha
c7fa050645 Merge branch 'release/2.0-vs' into merge_release20_vs 
* release/2.0-vs: (22 commits)
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  Updating the websdk version to 2.0.0-rel-20170908-653
  Insert NuGet Build 4.4.0-preview3-4475 into cli
  Remove out of support ubuntu1610
  Removing extra line feeds...
  Turning on the NuPkg publishing from Win x86
  The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
  Trivial change to start a VSO build
  Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
  Remove EOL openSuSE 42.1
  Trigger build
  Trigger build
  Sign additional files
  Update CLI_NETSDK_Version SDK to 2.0.2-vspre-20170825-1
  Dummy commit to trigger CI due to 20170824.1 publish nuget time out 20170824.1
  Insert NuGet Build 4.4.0-preview1-4434 into cli
  Update to SDK build which includes NuGet 4.4.0-preview1-4365
  Insert NuGet Build 4.4.0-preview1-4365 into cli
  ...
 2017-09-22 15:36:27 -07:00
Daniel Plaisted
ce885f76c4 Insert SDK 2.0.2-vspre-20170921-5 2017-09-21 15:21:29 -07:00
Andy Gerlicher
9e06395ed7 MSBuild 15.5.90 2017-09-21 12:45:07 -07:00
dotnet-bot
7287790200 Update CoreSetup to preview1-25719-04 2017-09-20 00:14:50 +00:00
Daniel Plaisted
ba1c8eda24 Insert SDK 2.0.2-vspre-20170915-1 2017-09-15 14:14:25 -07:00
Livar
b70923512c Merge pull request #7647 from dotnet/nuget-insertbuild4475 
Insert NuGet Build 4.4.0-preview3-4475 into cli
 2017-09-15 13:56:21 -07:00
Livar
baa49ef4c1 Merge pull request #7653 from AndyGerlicher/MSBuild.15.4.7 
MSBuild 15.4.7
 2017-09-15 10:04:37 -07:00
Livar
0a482954ae Merge pull request #7645 from livarcocc/remove_archiver_code 
Removing Microsoft.DotNet.Archive from the CLI
 2017-09-15 09:58:03 -07:00
Andy Gerlicher
f71eecfdd3 MSBuild 15.4.7 2017-09-14 11:04:59 -07:00
Vijay Ramakrishnan
c6482b8919 Updating the websdk version to 2.0.0-rel-20170908-653 2017-09-14 10:39:42 -07:00
Harsh Jain
4eb4cddbb7 Updated version of TestPlatform to 15.5.0-preview-20170914-09 2017-09-14 20:49:31 +05:30
NuGet Team Bot
5ce59a6179 Insert NuGet Build 4.4.0-preview3-4475 into cli 2017-09-13 17:27:51 -07:00
Livar Cunha
9cdb20b7a5 Removing Microsoft.DotNet.Archive from the CLI and instead depending on a nupkg. 2017-09-13 14:04:09 -07:00
Daniel Plaisted
f9b576cf5d Insert SDK version 2.0.1-servicing-20170912-1 2017-09-11 18:37:23 -07:00
John Beisner
74ad01b576 Adding consistent "Project" headers to inported props and target files. 2017-09-05 14:44:25 -07:00
Nick Guerrera
8534452274 Bump to stable runtime/framework packages 2017-09-05 13:28:02 -07:00
Nick Guerrera
2269efbbf0 Insert 2.0.1-servicing SDK in to 2.0.1-servcing CLI 2017-09-05 13:27:37 -07:00
Nick Guerrera
3514db05da Update shared framework dependency 2017-08-31 17:09:05 -07:00
seancpeters
79e94eb908 Updating new templates to 2.1.0 versions 2017-08-29 15:21:13 -07:00
Matt Galbraith
1156e52eb8 Update dependency version 2017-08-28 13:14:23 -07:00
Nick Guerrera
6d6d1c0c2b Merge branch 'master' into dotnet-bot-master-UpdateDependencies 2017-08-25 13:49:39 -07:00
Rainer Sigwald
ee5c02de77 MSBuild 15.5.74 2017-08-25 13:25:01 -07:00
William Li
1a36940549 Update CLI_NETSDK_Version SDK to 2.0.2-vspre-20170825-1 2017-08-25 13:22:01 -07:00
Daniel Plaisted
4662629964 Merge pull request #7478 from dsplaisted/update-runtime-to-2.1 
Update .NET Core runtime to 2.1
 2017-08-24 12:16:43 -07:00
NuGet Team Bot
069d94cbe4 Insert NuGet Build 4.4.0-preview1-4434 into cli 2017-08-24 11:22:51 -07:00
William Li
4ae52088bf Merge branch 'master' into merges/release/2.0.0-to-master-20170821-070027 2017-08-21 12:54:31 -07:00
Daniel Plaisted
be6fc8836f Update to 2.1 runtime 2017-08-17 22:55:43 -07:00
Daniel Plaisted
4598d7b2c2 Update to SDK with a maximum version for .NET Core of 2.1 2017-08-17 19:50:17 -07:00
Nick Guerrera
4434a8a832 Merge pull request #7417 from mlorbetske/dev/mlorbe/FixTemplating1206 
Fix dotnet/templating#1206
 2017-08-17 14:03:29 -07:00
Nick Guerrera
37714cd5f0 Merge pull request #7413 from Faizan2304/blameDataCollector 
Insert new bits of TPv2 and enable blame data collector
 2017-08-17 11:50:07 -07:00
Daniel Plaisted
acd690f7da Update to SDK build which includes NuGet 4.4.0-preview1-4365 2017-08-16 18:51:36 -07:00
Daniel Plaisted
cf657095ab Insert NuGet Build 4.4.0-preview1-4365 into cli 2017-08-16 15:35:54 -07:00
dotnet-bot
ebcd0fbf99 Update CoreSetup to preview2-25616-02 2017-08-16 21:23:21 +00:00
Daniel Plaisted
e94a82c9a3 Update to SDK build which includes NuGet 4.4.0-preview1-4365 (#7449) 2017-08-15 21:25:36 -07:00
Daniel Plaisted
dec65ebf4d Merge pull request #7448 from dsplaisted/update-nuget 
Insert NuGet Build 4.4.0-preview1-4365 into cli
 2017-08-15 14:45:55 -07:00
Daniel Plaisted
a4006bdbeb Insert NuGet Build 4.4.0-preview1-4365 into cli 2017-08-15 13:50:30 -07:00
Brett V. Forsgren
22a87d3ca6 Merge pull request #7430 from dotnet/merges/release/2.0.0-to-master-20170814-070029 
Merge release/2.0.0 to master
 2017-08-15 10:15:54 -07:00
Vijay Ramakrishnan
1a9bf33c3a Updating the websdk to 2.0.0-rel-20170815-630 2017-08-14 19:09:26 -07:00
William Li
1fa454bda4 Ingest new version Aspnet store 
Change the url and name accordingly for the name naming convention
 2017-08-14 16:05:22 -07:00
Brett V. Forsgren
77e289b114 Merge remote-tracking branch 'upstream/release/2.0.0' into merges/release/2.0.0-to-master-20170814-070029 2017-08-14 13:59:06 -07:00
Mike Lorbetske
be31443adf Fix dotnet/templating#1206 2017-08-10 23:56:43 -07:00
faahmad
ecd6c47d2e Insert new bits of TPv2 and enable blame data collector 2017-08-10 18:55:06 +05:30
William Lee
cda49654db Merge pull request #7371 from dotnet/merges/release/2.0.0-to-master-20170804-070030 
Merge release/2.0.0 to master
 2017-08-04 15:14:37 -07:00
Nick Guerrera
8c654cb9e1 Bump SDK version to align nuget versions 2017-08-04 00:53:05 -07:00
NuGet Team Bot
d4dd50210d Insert NuGet Build 4.3.0-rtm-4382 into cli 2017-08-03 21:58:34 -07:00
Mike Lorbetske
94cadf390b Update templates to 1.0.0-beta2-20170803-303 2017-08-03 10:38:33 -07:00
Livar
96b122e26f Merge branch 'master' into merges/release/2.0.0-to-master-20170731-070024 2017-07-31 11:00:18 -07:00
Livar
53f6fe597f Update SDK to 2.0.0-preview3-20170728-1 
Contains the new error message for .NET Framework referencing NetStandard 1.5 and 1.6 without the 2.0 SDK.
 2017-07-27 18:39:08 -07:00
Livar
39abdb1ef6 Merge pull request #7302 from dotnet/livarcocc-patch-1 
Update SDK to 2.0.0-preview3-20170727-2
 2017-07-27 16:37:35 -07:00
Livar
d864d60090 Update SDK to 2.0.0-preview3-20170727-2 2017-07-27 15:03:18 -07:00
Mike Lorbetske
09cfa32e5b Absorb update to MSTest version 2017-07-27 12:44:00 -07:00
Livar
6a67932370 Merge pull request #7297 from wli3/update-sdk-version 
Update SDK to 2.0.0-preview3-20170727-1
 2017-07-27 11:27:02 -07:00
William Li
68d211795a Update SDK to 2.0.0-preview3-20170727-1 2017-07-27 10:41:36 -07:00
Steve Sanderson
5af7786c45 Update SPA templates to 1.0.417 2017-07-27 15:16:29 +01:00
Nick Guerrera
9294718d8d Update Roslyn and F# satellites 2017-07-26 18:24:30 -07:00
Livar
f80fac2c51 Merge pull request #7270 from dotnet/merges/release/2.0.0-to-master-20170726-070023 
Merge release/2.0.0 to master
 2017-07-26 16:20:23 -07:00
Livar
e4a52e57b9 Update SDK to 2.0.0-preview3-20170726-3 2017-07-26 09:21:15 -07:00
Mike Lorbetske
f4d774b58c Switch to picking up the no-timestamp runtime store and package cache 2017-07-25 20:54:44 -07:00
Nick Guerrera
e126145d35 Merge pull request #7262 from seancpeters/update_to_coherence_26452 
updating to coherence 26452 & templating build 300
 2017-07-25 17:48:07 -07:00
Nick Guerrera
44638af313 Merge pull request #7230 from dotnet/nuget-insertbuild4324 
Insert NuGet Build 4.3.0-rtm-4324 into cli
 2017-07-25 15:50:49 -07:00
seancpeters
70d18839af updating to coherence 26452 & templating build 300 2017-07-25 15:39:33 -07:00
Nick Guerrera
4e92948870 Merge pull request #7254 from dotnet/merges/release/2.0.0-to-master-20170725-070023 
Merge release/2.0.0 to master
 2017-07-25 15:17:43 -07:00
Livar
18ee24c316 Merge pull request #7232 from dotnet/merges/release/2.0.0-to-master-20170724-070022 
Merge release/2.0.0 to master
 2017-07-24 13:29:28 -07:00
Ashley Hauck
9ff5da4dd2 Update Roslyn to 2.3.2-beta1-61921-05 in 2.0.0 2017-07-24 10:09:31 -07:00
NuGet Team Bot
81b9379536 Insert NuGet Build 4.3.0-rtm-4324 into cli 2017-07-23 16:23:47 -07:00
Livar
e678c04f03 Merge pull request #7221 from dotnet/livarcocc-patch-2 
Updating SDK to 2.0.0-preview3-20170721-7
 2017-07-22 17:03:12 -07:00
Mike Lorbetske
2848037380 Update to Coherence 26424 2017-07-21 19:01:49 -07:00
Livar
dfb88456ba Updating SDK to 2.0.0-preview3-20170721-7 2017-07-21 14:42:05 -07:00
Livar
13d5e92486 Merge pull request #7215 from rainersigwald/msbuild-15.3.409-for-2.0 
MSBuild 15.3.409
 2017-07-21 13:36:05 -07:00
Livar
a1f43a6960 Merge pull request #7218 from wli3/sdk-update-070721 
Updating SDK to 2.0.0-preview3-20170721-5
 2017-07-21 13:25:02 -07:00
William Li
d07a5021ac Updating SDK to 2.0.0-preview3-20170721-5 2017-07-21 12:31:54 -07:00
Livar
6ca8afe223 Merge branch 'release/2.0.0' into msbuild-15.3.409-for-2.0 2017-07-21 12:00:23 -07:00
Livar
cc0dbd3c22 Merge branch 'release/2.0.0' into dev/mlorbe/UpdateToCoherence26412 2017-07-21 11:58:03 -07:00
Livar
429cc2b0c1 Merge pull request #7208 from dotnet-bot/release/2.0.0-UpdateDependencies 
Update CoreSetup to preview3-25510-01 (release/2.0.0)
 2017-07-21 11:56:27 -07:00
Livar Cunha
a557206a0f Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170721-070025 
* dotnet/release/2.0.0:
  Revert "Updating SDK to 2.0.0-preview3-20170721-1"
  Updating SDK to 2.0.0-preview3-20170721-1
  Update SdkBrandName
  Insert NuGet Build 4.3.0-rtm-4315 into cli
  Changing the 'coherent' badge value.
 2017-07-21 11:29:52 -07:00
Livar Cunha
ab5130d7d9 Revert "Updating SDK to 2.0.0-preview3-20170721-1" 
This reverts commit c45fca648c.
 2017-07-21 10:17:32 -07:00
Rainer Sigwald
e0ff36ba8e MSBuild 15.3.409 2017-07-21 10:22:52 -05:00
Mike Lorbetske
08d6a0618e Update to coherence 26412 2017-07-20 23:28:49 -07:00
Livar
24a6742dd1 Merge pull request #7207 from dotnet/nuget-insertbuild4315 
Insert NuGet Build 4.3.0-rtm-4315 into cli
 2017-07-20 21:21:28 -07:00
Livar
c45fca648c Updating SDK to 2.0.0-preview3-20170721-1 2017-07-20 17:49:45 -07:00
dotnet-bot
7108da7170 Update CoreSetup to preview3-25510-01 2017-07-21 00:26:04 +00:00
NuGet Team Bot
6da75e02a4 Insert NuGet Build 4.3.0-rtm-4315 into cli 2017-07-20 12:48:04 -07:00
Livar
58c580dbcc Merge pull request #7201 from dotnet/merges/release/2.0.0-to-master-20170720-070024 
Merge release/2.0.0 to master
 2017-07-20 11:53:12 -07:00
Livar
f009fa1b1d Merge pull request #7191 from dotnet/merges/release/2.0.0-to-master-20170719-070023 
Merge release/2.0.0 to master
 2017-07-19 13:14:14 -07:00
Livar
baef48e53b Merge pull request #7193 from mlorbetske/dev/mlorbe/UpdateToCoherence26380 
Update to Coherence 26380
 2017-07-19 12:16:26 -07:00
Mike Lorbetske
8fe8095970 Update to Coherence 26380 2017-07-19 10:37:19 -07:00
Steve Sanderson
aed35f482d Update SPA templates to 1.0.0-preview-000409 2017-07-19 14:40:15 +01:00
Livar
1728aef325 Merge branch 'master' into merges/release/2.0.0-to-master-20170718-070024 2017-07-18 15:58:34 -07:00
dotnet-bot
33b12c9fe4 Update CoreSetup to preview3-25518-01 2017-07-18 17:36:33 +00:00
Nick Guerrera
16d7104b36 Merge pull request #7180 from dotnet/nguerrera-update-sdk 
Update dotnet/sdk to latest
 2017-07-17 20:18:21 -07:00
Nick Guerrera
61b2990d62 Merge pull request #7175 from rainersigwald/msbuild-15.3.407-for-2.0 
MSBuild 15.3.407
 2017-07-17 19:45:17 -07:00
Nick Guerrera
6de76e047b Update dotnet/sdk to latest 2017-07-17 17:03:51 -07:00
Nick Guerrera
b606267b0d Update dotnet/sdk to latest 2017-07-17 16:16:14 -07:00
Nick Guerrera
0b467f1954 Merge pull request #7167 from weshaggard/UpdateNetFxSupportPackage 
Update the .NET Framework Support package
 2017-07-17 15:58:24 -07:00
Wes Haggard
7eb8260a2f Update the .NET Framework Support package 
Need to update in order to get the fix https://github.com/dotnet/corefx/pull/22248
 2017-07-17 14:03:58 -07:00
seancpeters
3c4be26876 updating to coherence 26343 & templating build 288 2017-07-17 14:01:01 -07:00
Rainer Sigwald
dd47000924 MSBuild 15.3.407 2017-07-17 15:52:50 -05:00
Nick Guerrera
feec3b7661 Merge pull request #7177 from dotnet/ragrawal-updatenuget4294 
update nuget to 4.3.0-rtm-4294
 2017-07-17 13:18:59 -07:00