Commit graph

1334 commits

Author SHA1 Message Date
John Luo
88f10b47ee Update to consume aspnetcore 2.0.6-10008 timestamp build 2018-01-25 13:01:48 -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
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
Peter Huene
7cba11483e
Add 2.0.5 ASP.NET store to native installers. 2018-01-22 16:09:46 -08:00
John Luo
3c2e78a403 Update to consume aspnetcore 2.0.6-10007 2018-01-22 15:26:02 -08:00
Peter Huene
e752f2ace4
Fix Windows servicing builds.
The Windows servicing builds require a unique package source name in the
NuGet configuration file when passing in multiple package sources.
2018-01-22 09:47:17 -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
Peter Huene
3c1911bd67
Update runtime and branding to 2.0.6. 2018-01-18 11:10:25 -08:00
Peter Huene
d4a4424b77
Updating the branding of the CLI to 2.1.5 2018-01-17 16:41:02 -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 Cunha
34ce5c5fdd Adding aspnet dev feed. 2018-01-09 18:52:34 -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
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
William Lee
860de6339c
Update wix version (#8313) 2018-01-02 12:37:00 -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
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
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
c768b01523 Updating the branding of the CLI to 2.1.4 2017-12-07 13:15:46 -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
John Beisner
fba1ad7287 Fixed a typo... 2017-12-05 09:19:22 -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 Beisner
1362c6c4f1 The access key is already resolved: 'CoreSetupBlobAccessTokenParam' 2017-12-01 14:06:06 -08:00
John Beisner
5607d1f68c Fixed another typo... 2017-12-01 14:01:07 -08:00
John Beisner
c54911b788 Dependency Uptake: download and import a package version props file. 2017-12-01 12:39:51 -08:00
John Luo
9d391355f8 Consume 2.0.4 LZMA attempt 2 2017-12-01 10:54:49 -08:00
John Beisner
4adabde4c9 Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties. 2017-12-01 09:56:11 -08:00
John Beisner
b092ad0141 Changes per code review... 2017-12-01 08:05:33 -08:00
John Luo
6e41f29b38 Consume 2.0.4 LZMA 2017-11-30 16:43:20 -08:00
John Beisner
3d39772fe9 The URL root will include the "dotnet" container; the structure will be identical after the "dotnet" container. 2017-11-30 12:09:27 -08:00