Commit graph

8608 commits

Author SHA1 Message Date
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
William Lee
9e535a867a
Remove PackageToProjectFileAdder (#8468)
Add reference to project with version * is doing the same thing
2018-01-24 17:55:26 -08:00
Livar Cunha
1c2af1fa7f Merged PR 103030: Merge release/2.1 to release/2.1-MSRC 2018-01-24 18:39:17 +00:00
Livar
1d8150cfdf
Merge pull request #8463 from AndyGerlicher/MSBuild15.6.69
MSBuild 15.6.69
2018-01-24 10:25:19 -08:00
William Lee
05052c0541
Use rich mock to test InstallCommand (#8402)
To ensure the mock has the same behavior the component has, run mock under the same tests the adapter has.
It is a common problem that moq has -- "everything is mocked out, you are not test anything"
2018-01-24 10:16:27 -08:00
Andy Gerlicher
e55de710cb MSBuild 15.6.69 2018-01-24 09:14:40 -08:00
John Beisner
dddf53509f
Merge pull request #8460 from johnbeisner/Update2.1.3xx
Fix non-fatal null exception when no extra parameters are passed.
2018-01-24 08:45:08 -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
Livar
26c0e81fe6
Merge pull request #8458 from KevinRansom/updatefsharp
update fsharp compiler to match vs2017.6 preview 3
2018-01-23 16:53:55 -08:00
jbeisner
954e2de29e Fix non-fatal null exception when no extra parameters are passed. 2018-01-23 23:59:31 +00:00
Kevin Ransom
b3c2414804 Update package reference 2018-01-23 15:42:57 -08:00
Kevin Ransom
d41b99205a update fsharp compiler to match vs2017.6 preview 3 2018-01-23 13:50:44 -08:00
Matt Mitchell
f4a0d2db0e
Merge pull request #8453 from johnbeisner/Revert8443
Revert PR:8443
2018-01-23 10:58:58 -08:00
jbeisner
338bdfb47c Revert "If 'OrchestratedPackageVersionsProps.props' is present, do not re-download the file every time 'Run-Build' or 'Build' is called."
This reverts commit d3e905997c.
2018-01-23 17:46:09 +00:00
jbeisner
94fc976ea5 Revert "If the Nuget.config has already been generated, do not re-generate the file every time 'Run-Build' or 'Build' is called."
This reverts commit 9d5bd8637e.
2018-01-23 17:45:14 +00:00
Livar Cunha
e5ac8244c3 Making a document only commit to trigger another build of the CLI. 2018-01-23 07:48:14 -08:00
Matt Mitchell
80a5a829ea
Merge pull request #8448 from johnbeisner/OBuildFix
Use a unchanging version for 'Microsoft.NETCore.App'
2018-01-23 07:43:11 -08:00
jbeisner
579e84734a The orchestrated "PackageVersion" type variables should not be used in any of the 'proj' files of the built build tools under: "build_projects" 2018-01-22 21:39:47 -08:00
John Luo
80623d1d1e Merged PR 102713: Merge johluo/aspnetcore-2.0.6-10007 to release/2.1-MSRC
This updates the CLI to consume our latest 2.0 build. Is this the correct branch to merge in? Build definitions need to be updated to ingest the packages at msrc-2-0-aspnet blob store container; this will be the last time we update the build definition and we'll keep using this container in the future. @<licavalc@microsoft.com> there's also a change required to build with the new runtime store due to transitive dependencies. You will need to now install 2.0.0, 2.0.3 and 2.0.5 runtime stores before being able to install the new 2.0.6 runtime store.
2018-01-23 02:42:32 +00:00
Livar
34748d5a12
Merge pull request #8447 from wli3/separate-toolpackage-shim
Separate tool package and shim file location
2018-01-22 18:09:23 -08:00
William Li
36c01137ad Separate tool package and shim file location 2018-01-22 16:30:52 -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
Livar
c9ac5c9c02
Merge pull request #7951 from wfurt/freebsd
add basic support for FreeBSD
2018-01-22 14:17:56 -08:00
Livar
c46ef46b09
Merge pull request #8444 from livarcocc/update_branding
Updating the CLI branding and version to 2.1.300.
2018-01-22 14:16:46 -08:00
Livar
8b0d66468c
Merge pull request #8446 from livarcocc/update_master_branding
Updating the branding to 2.1.3-preview2.
2018-01-22 14:16:16 -08:00
John Beisner
f6bc5d0ad9
Merge pull request #8443 from johnbeisner/WriteNugetConfigFileTargetModification
Generate a Nuget.config once
2018-01-22 14:11:27 -08:00
Zbyněk Sailer
8cb01e226c LOC CHECKIN | cli - master | 20180112 (#8385)
* LOC CHECKIN | cli - master | 20180112

* LOC CHECKIN | cli - master | 20180118 update

* LOC CHECKIN | cli - master | 20180119 update | DEU fix
2018-01-22 13:56:03 -08:00
Livar Cunha
df2bbb81b2 Updating the branding to 2.1.3-preview2. 2018-01-22 13:32:51 -08:00
Livar Cunha
6695936718 Updating the CLI branding and version to 2.1.300. 2018-01-22 13:26:57 -08:00
jbeisner
d3e905997c If 'OrchestratedPackageVersionsProps.props' is present, do not re-download the file every time 'Run-Build' or 'Build' is called. 2018-01-22 20:49:23 +00:00
jbeisner
9d5bd8637e If the Nuget.config has already been generated, do not re-generate the file every time 'Run-Build' or 'Build' is called. 2018-01-22 20:37:35 +00:00
William Lee
839eccbcaf
MacOs HighSierra Fallback (#8437)
walk around for https://github.com/dotnet/corefx/issues/26488
2018-01-22 10:45:35 -08:00
Peter Huene
7d832b533e Merged PR 102565: Fix Windows servicing builds.
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 17:57:16 +00: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
John Beisner
4dc001ca47
Merge pull request #8441 from dagood/dotnetchecksums
Fix "dotnet" typo in donetclichecksums manifest data
2018-01-22 08:40:51 -08:00
Davis Goodin
0e6586de49 Fix "dotnet" typo in donetclichecksums 2018-01-22 09:42:32 -06:00
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
William Lee
02a98d4e63
[tools] Integrate NuGet (#8414)
* Integrate NuGet ask

* Update NuGet version. Rely on NuGet to filter TFM. And use asset.json to find entrypoint

* Update XML file to per TFM

* Add extra property to the fake project according to nuget

* Treat nuget fallback folder as offline cache for tool

* Require -g to install global tool

* Copy test asset during test project build

* Address code review on LockFileMatchChecker

* Get NETCorePlatformsImplicitPackageVersion from PackageDefinitions

* Edit and add missing loc

* Change LockFileMatchChecker to local function

* Adding comment

* Add to content instead of copy

* Download platform package instead

* disable SDK side implicit NuGetFallbackFolder

* merge loc

* Revert extra line

* use a prerelease platforms version that supports alpine
2018-01-19 17:15:34 -08:00
William Lee
c7d44beca7
Merge pull request #8433 from natemcmaster/simplify-win-shim
Simplify the tool_launcher to build for just one version of .NET Framework
2018-01-19 16:19:51 -08:00
William Lee
e317925977
Merge pull request #8435 from dotnet/nuget-insertbuild4846
Insert NuGet Build 4.7.0-preview1-4846 into cli
2018-01-19 15:25:28 -08:00
Livar
e224249f2c
Merge pull request #8432 from natemcmaster/aspnet-28124
Update to aspnetcore 2.1.0-preview1-28124
2018-01-19 15:21:08 -08:00
Nate McMaster
c8bae2ffda Simplify the tool_launcher to build for just one version of .NET Framework 2018-01-19 15:19:33 -08:00
NuGet Team Bot
47758a4ec2 Insert NuGet Build 4.7.0-preview1-4846 into cli 2018-01-19 14:32:57 -08:00
Nate McMaster
67f98be680 Update to aspnetcore 2.1.0-preview1-28124 2018-01-19 13:17:54 -08:00
John Beisner
e3a19395fb
Merge pull request #8333 from natemcmaster/dotnet-install
Update dotnet-install scripts to support installing the ASP.NET Core runtime
2018-01-19 12:01:16 -08:00
William Lee
8e58b54c05
Merge pull request #8430 from dotnet/nuget-insertbuild4839
Insert NuGet Build 4.7.0-preview1-4839 into cli
2018-01-18 20:52:16 -08:00
NuGet Team Bot
b0cfb18501 Insert NuGet Build 4.7.0-preview1-4839 into cli 2018-01-18 17:47:41 -08:00
NuGet Team Bot
d0cdc9c266 Insert NuGet Build 4.6.0-rtm-4825 into cli 2018-01-18 16:13:18 -08:00