Commit graph

7588 commits

Author SHA1 Message Date
Livar
363ef36b70
Merge pull request #8429 from dotnet/nuget-insertbuild4825
Insert NuGet Build 4.6.0-rtm-4825 into cli
2018-01-19 21:25:12 -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
cda1fdffa5
Merge pull request #8427 from tannergooding/release/2.1
Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
2018-01-18 14:46:23 -08:00
Peter Huene
ab104fa26d Merged PR 102075: Update runtime and branding to 2.0.6.
Update runtime and branding to 2.0.6.
2018-01-18 22:13:27 +00: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
Peter Huene
274beefb42
Merge pull request #8425 from tannergooding/release/2.1.1xx
Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
2018-01-18 13:31:45 -08:00
Livar
a9c4a1ccab
Fixing the prefercliruntime asset 2018-01-18 13:06:33 -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
Peter Huene
2170143a18 Merged PR 101962: Merge branch 'release/2.1' into 'release/2.1-MSRC' 2018-01-18 18:53:44 +00:00
Peter Huene
778e21c870
Merge branch 'release/2.1' into 'release/2.1-MSRC'
* release/2.1:
  Updating the branding of the CLI to 2.1.5
2018-01-17 18:40:57 -08:00
Peter Huene
7b913c8e53
Merge pull request #8420 from peterhuene/update-sdk-branding-2.1.5
Updating the branding of the CLI to 2.1.5
2018-01-17 18:31:00 -08:00
Peter Huene
d4a4424b77
Updating the branding of the CLI to 2.1.5 2018-01-17 16:41:02 -08:00
Peter Huene
ba248c25cb Merged PR 101715: Merge release/2.1 to release/2.1-MSRC 2018-01-17 01:11:07 +00:00
Peter Huene
933cb1f669
Merge branch 'release/2.1' into pehuene/merge-release-2.1-to-msrc
* release/2.1: (36 commits)
  Adding aspnet dev feed.
  Fixing redist to use the new way to consume roslyn. I merged it wrong before.
  Fix tool_roslyn_satellite by making it use the new dependency version properties.
  Update wix version (#8313)
  Update the support package on the CLI to fix binding redirects on 4.7.1
  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.
  ...
2018-01-16 17:04:17 -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
Livar
596f489414
Merge pull request #8390 from dotnet/livarcocc-patch-1
Updates the TestPlatform to 15.6.0-preview-20180109-01
2018-01-16 12:12:30 -08:00
Livar
25de7693fe
Merge pull request #8389 from livarcocc/update_branding_for_2_1_100
Updating the branding of the CLI to 2.1.100
2018-01-16 11:54:23 -08:00
Livar Cunha
e7625eba69 Merge branch 'update_branding_for_2_1_100' of github.com:livarcocc/cli-1 into update_branding_for_2_1_100
* 'update_branding_for_2_1_100' of github.com:livarcocc/cli-1:
  MSBuild 15.6.44
2018-01-16 09:38:22 -08:00
Livar Cunha
8caa7b9f0d Updating the channel to release/2.1.1xx. We can manually update release/2.0 if necessary, but LTS is always updated every time we release. 2018-01-16 09:37:59 -08:00
Andy Gerlicher
af8ea2ffb7 MSBuild 15.6.54 2018-01-13 23:22:34 -08:00
Livar
1c380b3114
Merge branch 'release/2.1.1xx' into update_branding_for_2_1_100 2018-01-12 16:41:41 -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 Cunha
d6d3b451d6 Updating the branding of the CLI to 2.1.100 2018-01-12 15:37:54 -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
Livar
f02eef83f7
Merge pull request #8350 from livarcocc/merge_release_21_msrc
Merge release/2.1-MSRC into release/2.1
2018-01-09 21:00:28 -08:00
Livar Cunha
34ce5c5fdd Adding aspnet dev feed. 2018-01-09 18:52:34 -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
ce5e10dea9
Merge pull request #8318 from dotnet/merges/release/2.0.0-to-release/2.1-20180103-080038
Merge release/2.0.0 to release/2.1
2018-01-08 17:37:43 -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
Livar Cunha
80933404d0 Fix tool_roslyn_satellite by making it use the new dependency version properties. 2018-01-05 12:53:03 -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
William Lee
860de6339c
Update wix version (#8313) 2018-01-02 12:37:00 -08:00
John Luo
5e8add2190 Merged PR 99341: Update to consume aspnetcore 2.0.5-155
Update to consume aspnetcore 2.0.5-155 blob store at msrc-2-0-aspnet-20171220
2017-12-21 06:33:57 +00:00
John Luo
8c93b6d960 Update to consume aspnetcore 2.0.5-155 2017-12-20 19:25:45 -08:00
John Luo
6d1fb5ecc1 Merged PR 99097: Update to consume aspnetcore 2.0.5-152
Drops at msrc-2-0-aspnet-20171219

@<licavalc@microsoft.com> I accidentally pushed to release/2.1-MSRC directly while preparing this PR. I pushed a revert and recreated the PR. Would this create any problems other than a messy commit history?
2017-12-20 01:02:22 +00: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 Cunha
1912ce9e20 Commit to trigger a rebuild of the CLI because of a build in place from the Runtime. 2017-12-18 18:16:55 -08:00
Livar Cunha
5f494e8b4a Merged PR 98752: Adding the 2.0.3 asp.net store to the native installer tests.
Adding the 2.0.3 asp.net store to the native installer tests.
2017-12-17 22:41:38 +00:00
Livar Cunha
d5c6133238 Adding the 2.0.3 asp.net store to the native installer tests. 2017-12-15 14:46:42 -08:00
John Luo
34c2b91200 Merged PR 98632: Update to consume aspnetcore 2.0.5-147
Update to consume aspnetcore 2.0.5-147

Drop available at msrc-2-0-aspnet-20171214
2017-12-15 04:56:07 +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