Commit graph

7281 commits

Author SHA1 Message Date
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 Beisner
da63455015
Merge pull request #8213 from johnbeisner/ExplictDependencies
Use explicit and non-preview versions for the build DLL dependencies
2017-12-13 12:51:13 -08:00
John Beisner
94e43afa68 Use explict and non-preview versions for the build DLL 2017-12-11 16:54:35 -08:00
John Beisner
fd0e131ca0
Merge pull request #8210 from natemcmaster/dotnet-install
Correctly check for existence of shared runtime in dotnet-install scripts
2017-12-11 13:34:48 -08:00
John Beisner
61bc1d82b4
Merge pull request #8211 from johnbeisner/FixMicrosoftBuildRuntime
Fixing NuGet reference to Microsoft.Build.Runtime
2017-12-11 12:31:56 -08:00
John Beisner
ed4413b9fb Fixing a typo... 2017-12-11 11:25:52 -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
Nate McMaster
2c931b810d Fix dotnet-install to check the right path for no-op installs when --shared-runtime is specified 2017-12-11 10:10:08 -08:00
Livar
8b4773e1d3
Merge pull request #8196 from livarcocc/port_engine_fix
Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated
2017-12-08 14:38:55 -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
0e9cd65efc
Merge pull request #8186 from livarcocc/fix_msbuild_version
Fix msbuild version
2017-12-07 14:34:42 -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
John Beisner
174c9ff60e
Merge pull request #8152 from johnbeisner/ConfigNuget
Dependency Uptake: CLI - part 2
2017-12-05 11:14:18 -08:00
John Beisner
fba1ad7287 Fixed a typo... 2017-12-05 09:19:22 -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
2cdb5a9f7e
Merge pull request #8119 from natemcmaster/install-script
Add parameter to dotnet-install to support pulling from private blob feeds
2017-12-04 13:28:08 -08:00
John Beisner
f7947a13d3
Merge pull request #8120 from natemcmaster/install-script2
Pipe ldconfig stderr to /dev/null
2017-12-04 13:27:52 -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
0f7783f72b Fixed typo... 2017-12-01 13:59:25 -08:00
John Beisner
36e47bf417
Merge pull request #8140 from johnbeisner/ConfigNuget
Dependency Uptake: CLI - part 1
2017-12-01 13:31:39 -08:00
John Beisner
165f7c4575 The first pass will need the extra args [same as run-build.ps1]. 2017-12-01 12:40:40 -08:00
John Beisner
c54911b788 Dependency Uptake: download and import a package version props file. 2017-12-01 12:39:51 -08:00
Livar
a0ca411ca5
Merge pull request #8150 from dotnet/johluo/2.0.4-lzma-2
Consume 2.0.4 LZMA attempt 2
2017-12-01 11:56:56 -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
Livar
555ea4592a
Merge pull request #8141 from dotnet/johluo/2.0.4-lzma
Consume 2.0.4 LZMA
2017-11-30 17:57:26 -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
John Beisner
4aea36d48e No passwords should be in the open as environmental variables. 2017-11-30 10:36:16 -08:00
John Beisner
5fb91f9661 Use the 'PB_AssetRootUrl' and 'PB_AssetRootAccessTokenSuffix' for all asset downloads if set - "TransportFeed" should be "BlobFeed". 2017-11-30 10:35:51 -08:00
John Beisner
e4c6f304cd
Merge pull request #8123 from johnbeisner/ConfigNuget
Writing a NuGet.config as part of the preparatory steps
2017-11-30 10:27:57 -08:00
John Beisner
f29acd3153 If the build is a 'DotNetBuildOffline'; do not write any feed lines. 2017-11-29 10:22:27 -08:00
John Beisner
34351d6f1e Ignore the NuGet.Config at the root as a source file; it is dynamically generated. 2017-11-29 09:31:25 -08:00
John Beisner
76dc4a510e The modification to build.cmd did not have the desired effect. 2017-11-28 19:00:51 -08:00
John Beisner
ae5e396f94 Handling the possible semi-colon(s) in the property parameters. 2017-11-28 17:39:35 -08:00
John Beisner
57a2ccfb2c Changes per code review... 2017-11-28 17:12:44 -08:00
Livar
a5cb7f38a4
Merge pull request #8109 from livarcocc/update_branding_to_2_1_2_and_take_2_0_4_runtime
Updating the CLI branding to 2.1.3 and ingesting the 2.0.4 runtime.
2017-11-28 16:13:27 -08:00
Nate McMaster
9a8316cd12 Always append feed_credential to URIs in dotnet-install.{sh,ps1} 2017-11-28 14:23:30 -08:00
Nate McMaster
fd04fdd5f2 Add parameter to dotnet-install to support pulling from private blob feeds 2017-11-28 13:32:32 -08:00