Commit graph

618 commits

Author SHA1 Message Date
Peter Huene
2f46bd7edd
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-02-13 15:23:32 -08:00
Nick Guerrera
bc1fb44364 Use satellites from roslyn package, not cli-deps-satellites 2018-02-12 16:52:26 -08:00
Nick Guerrera
8fcbb631c9 Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx 2018-02-12 15:56:07 -08:00
Kevin Ransom
2f9d8f8f9c Update fsharp 2018-02-12 11:38:37 -08:00
Livar
0468da6ada
Merge pull request #8575 from rainersigwald/msbuild-15.6.81
MSBuild 15.6.81
2018-02-12 09:41:24 -08:00
Livar
04dc2d19ca
Merge pull request #8580 from dotnet/nuget.client.release-4918-1-1
Insert NuGet Build 4.6.0-rtm-4918 into cli
2018-02-10 16:32:36 -08:00
NuGet Team Bot
6003685b86 Insert NuGet Build 4.6.0-rtm-4918 into cli 2018-02-09 10:52:38 -08:00
Livar Cunha
978957315b Fixing update dependency by using the new APIs. We broke this when we updated the version of VersionTools. 2018-02-09 10:31:53 -08:00
Rainer Sigwald
eecb8f63a5 MSBuild 15.6.81 2018-02-09 09:43:55 -06:00
Andy Gerlicher
e0d138e0df MSBuild 15.6.80 2018-02-07 19:24:28 -08:00
Nick Guerrera
cdf3901658
Merge pull request #8498 from livarcocc/update_roslyn
Updating Roslyn to 2.7.0-beta3-62529-05.
2018-02-05 10:28:30 -08:00
Livar
5b081a2ba2
Merge pull request #8508 from dotnet/nuget.client.release-4880-1-1
Insert NuGet Build 4.6.0-rtm-4880 into cli
2018-02-05 10:17:41 -08:00
Livar
133277037e
Merge pull request #8520 from AndyGerlicher/MSBuild15.6.76
MSBuild 15.6.76
2018-02-05 10:17:16 -08:00
Nick Guerrera
d4dedc616c
Merge branch 'release/2.1.1xx' into update_roslyn 2018-02-02 14:06:05 -08:00
Nick Guerrera
ad1292bac2 Remove obsolete F# satellite package 2018-02-02 02:44:14 +01:00
Andy Gerlicher
617aa3725c MSBuild 15.6.76 2018-02-01 14:57:27 -08:00
Kevin Ransom
077b613d7e Update F# to match dev15.6 preview 4 2018-01-31 16:26:57 -08:00
NuGet Team Bot
dc6ae8beae Insert NuGet Build 4.6.0-rtm-4880 into cli 2018-01-30 15:18:26 -08:00
Livar Cunha
6fd727b646 Updating Roslyn to 2.7.0-beta3-62529-05. 2018-01-29 14:16:51 -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
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
Livar
9881b8d745
Merge pull request #8396 from AndyGerlicher/MSBuild15.6.54
MSBuild 15.6.54
2018-01-16 12:13:57 -08:00
Andy Gerlicher
af8ea2ffb7 MSBuild 15.6.54 2018-01-13 23:22:34 -08: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
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
NuGet Team Bot
168bbff95d Insert NuGet Build 4.6.0-rtm-4791 into cli 2018-01-09 16:58:29 -08: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
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
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
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
John Luo
8c93b6d960 Update to consume aspnetcore 2.0.5-155 2017-12-20 19:25:45 -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
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
John Luo
34ec8c2480 Update to consume aspnetcore 2.0.5-146 2017-12-13 16:45:48 -08:00
Livar Cunha
ed916733ee Updating the runtime to 2.0.5. 2017-12-13 09:27:06 -08: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
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
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
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
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
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
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
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
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
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
Nick Guerrera
129b064900 Update F# and Roslyn translations 2017-11-21 17:02:26 -08: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
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
Mike Lorbetske
d5c799b926 Update template engine version for 15.5 2017-11-17 18:40:33 -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
NuGet Team Bot
0cd05674ac Insert NuGet Build 4.5.0-rtm-4651 into cli 2017-11-16 16:43:21 -08: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
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
Livar Cunha
fe69088703 Updating Roslyn version. 2017-11-15 13:22:30 -08: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
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
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
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