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

7404 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Livar Cunha
275e4c9986 Merged PR 98367: Update to consume aspnetcore 2.0.5-146 
Update to consume aspnetcore 2.0.5-146
 2017-12-14 00:48:13 +00:00
John Luo
34ec8c2480 Update to consume aspnetcore 2.0.5-146 2017-12-13 16:45:48 -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
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
0bc62bf6aa Merged PR 98143: Merge merge_release_21 to release/2.1-MSRC 2017-12-12 23:34:33 +00: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
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
f5a93d57da Fixing the expected fx-version. 2017-12-07 13:41:36 -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
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
Livar Cunha
78c4161cb6 Merged PR 96913: Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5. 
Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5.
 2017-12-05 05:41:34 +00: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
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