Commit graph

8497 commits

Author SHA1 Message Date
Livar Cunha
f557859feb Updating NuGet to 4.6.1-rtm-5019 2018-03-20 14:22:54 -07:00
William Lee
9cc2b7cd2f
Change --source to --source-feed and make it additional (#8833)
Other than change source to source-feed and make it additional instead of exclusive. I changed source to be multiple. Because restore support multiple source https://github.com/Microsoft/dotnet/issues/361

As for mock. The offline feed and source feed is considered the same, so remove the category of “source”. I renamed source to “AdditionalFeed” because that is more accurate on implementation level.

Note:
NuGet feed don’t have order. Whichever responses the fastest, is the first.
No change on restore.

scripts/cli-test-env.sh change is due to mac 10.13 is finally added to RID graph. And it is “considered” one of the CLI supported RID
2018-03-19 22:22:45 -07:00
Nate McMaster
fe6d6fa95e
Generate Microsoft.NETCoreSdk.BundledCliTools.props 2018-03-19 14:29:20 -07:00
Livar
892cb5248b
Merge pull request #8828 from dotnet/update_sdk
Update SDK to 2.1.200-preview-62717-01
2018-03-19 11:24:20 -07:00
Livar
bca991fddb
Update SDK to 2.1.200-preview-62717-01 2018-03-16 17:57:25 -07:00
Livar
512aefa43a
Merge pull request #8811 from dotnet/update_sdk
Update SDK to 2.1.200-preview-62715-08
2018-03-16 17:34:31 -07:00
Livar
67c4562f43
Merge pull request #8822 from livarcocc/merge_master_3xx
Merge master into release/2.1.3xx
2018-03-16 17:32:30 -07:00
John Beisner
470acd8abe
Alpine fix; plus 1 (#8821)
* The '-n' option to 'cp' does not exist for Alpine; don't use "$ID.$VERSION_ID" for the error message.

* Try "cp -R -u"  for alpine variants.

* Fixing a comment...
2018-03-16 16:26:56 -07:00
Livar
e2c3f7e3d4
Updating the SDK to 2.1.200-preview-62716-06. 2018-03-16 13:32:07 -07:00
Livar
005f87257a
Merge pull request #8810 from dotnet/prkrishn/update-versions
Update AspNetCore package versions to 2.1.0-preview2-30338
2018-03-16 10:41:15 -07:00
Livar
91c50b56a0
Merge pull request #8813 from dotnet/nguerrera/insert-sdk
Update dotnet/sdk to latest
2018-03-16 10:40:58 -07:00
Livar
eeca22fc71
Updating the SDK to 2.1.200-preview-62716-04 2018-03-15 21:23:22 -07:00
William Lee
3f09a889d9
Update tool (#8794) 2018-03-15 19:45:11 -07:00
Nick Guerrera
fb093499f0
Update dotnet/sdk to latest
Includes fast ResolvePackageAssets
2018-03-15 18:37:39 -07:00
William Lee
3d13658f97 Update SDK to2.1.300-preview2-62715-07 (#8808) 2018-03-15 18:36:48 -07:00
Livar
b0acac94b8
Update SDK to 2.1.200-preview-62715-08 2018-03-15 17:08:38 -07:00
Pranav K
d5894edefa
Update AspNetCore package versions to 2.1.0-preview2-30338 2018-03-15 16:20:14 -07:00
Livar
680e72993b
Merge pull request #8795 from natemcmaster/aspnetcore-alpine
Upgrade to aspnetcore 2.1.0-preview2-30331 and pull aspnetcore for Alpine Linux
2018-03-15 14:23:20 -07:00
John Beisner
2a63f9e76c
Merge pull request #8788 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-15 13:15:51 -07:00
John Beisner
123df7f386
Follow-up PR for Linux-arm; CLI:master (#8797)
* Fix the badge for Linux-arm.

* Add comment for the LZMA; turn off displaying of test results for arm*
2018-03-15 12:30:11 -07:00
John Beisner
a54f0ffb81
Enable 'arm' builds in the CLI (#8791)
* First draft enablement of Win-arm and Linux-arm builds for the CLI.

* Fixing a typo

* Disable tests for arm; enable badges and FinalizeBuild for arm.

* Remove the 'Win-arm' leg.

* Update the README

* Update the README [2]

* Update netci.groovy

* Fixing a hard-coded Architecture: 'linux-x64'; removing the LZMA for 'arm'.
2018-03-14 19:04:25 -07:00
Nate McMaster
c257087ca6 Upgrade to aspnetcore 2.1.0-preview2-30331 and pull aspnetcore for Alpine Linux 2018-03-14 16:47:59 -07:00
Livar
06ce7628d3
Merge pull request #8786 from livarcocc/merge_release_211xx_into_release_212xx
Merge release/2.1.1xx into release/2.1.2xx
2018-03-13 21:01:00 -07:00
Livar
8fd0e7317d
Updating Roslyn to 2.8.0-beta2-62713-11 2018-03-13 20:26:51 -07:00
Livar Cunha
b87e9521cd Merge branch 'release/2.1.1xx' into merge_release_211xx_into_release_212xx
* release/2.1.1xx: (21 commits)
  Updating the SDK version to 2.1.100-preview-62714-01
  Updating the branding of the CLI to 2.1.102.
  Remove cli-deps from sources.
  Update Roslyn to 2.7.0-beta3-62707-11
  Update to the 15.6 RTM version of the test SDK in templates
  Update to consume aspnetcore 2.0.6-10011
  Updating TestPlatform to 15.6 RTM
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  Build trigger commit.
  Update to consume aspnetcore 2.0.6-10008 notimestamp build
  Update to consume aspnetcore 2.0.6-10008 timestamp build
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
  Making a document only commit to trigger another build of the CLI.
  Add 2.0.5 ASP.NET store to native installers.
  Update to consume aspnetcore 2.0.6-10007
  Fix Windows servicing builds.
  Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
  Update runtime and branding to 2.0.6.
  ...

 Conflicts:
	build/Branding.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Version.props
	packaging/osx/clisdk/resources/cs.lproj/conclusion.html
	packaging/osx/clisdk/resources/de.lproj/conclusion.html
	packaging/osx/clisdk/resources/en.lproj/conclusion.html
	packaging/osx/clisdk/resources/es.lproj/conclusion.html
	packaging/osx/clisdk/resources/fr.lproj/conclusion.html
	packaging/osx/clisdk/resources/it.lproj/conclusion.html
	packaging/osx/clisdk/resources/ja.lproj/conclusion.html
	packaging/osx/clisdk/resources/ko.lproj/conclusion.html
	packaging/osx/clisdk/resources/pl.lproj/conclusion.html
	packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
	packaging/osx/clisdk/resources/ru.lproj/conclusion.html
	packaging/osx/clisdk/resources/tr.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
	packaging/windows/clisdk/bundle.wxl
2018-03-13 20:23:33 -07:00
Livar
8d409357db
Merge pull request #8785 from dotnet/update_sdk
Updating the SDK version to 2.1.100-preview-62714-01
2018-03-13 20:16:10 -07:00
Livar
7d338430b3
Merge pull request #8784 from livarcocc/update_branding_to_102
Updating the branding of the CLI to 2.1.102.
2018-03-13 20:15:54 -07:00
Livar
6d9177f143
Merge pull request #8770 from livarcocc/re_enable_template_test
Re-activate templating test.
2018-03-13 18:11:23 -07:00
Livar
a662fda7aa
Merge pull request #8783 from dotnet/update_roslyn
Update Roslyn to 2.7.0-beta3-62707-11
2018-03-13 18:10:10 -07:00
Livar
2e7d92be25
Updating the SDK version to 2.1.100-preview-62714-01 2018-03-13 18:09:31 -07:00
Livar Cunha
80978d689b Updating the branding of the CLI to 2.1.102. 2018-03-13 18:05:41 -07:00
Peter Huene
8444cb04b5
Merge pull request #8781 from peterhuene/msrc-merge
Merge release/2.1.1xx-MSRC to release/2.1.1xx
2018-03-13 17:34:13 -07:00
Peter Huene
b724d8be12
Remove cli-deps from sources.
This commit removes cli-deps from sources.
2018-03-13 16:59:13 -07:00
Livar
b197f75b45
Update Roslyn to 2.7.0-beta3-62707-11 2018-03-13 16:42:22 -07:00
Livar
fa5b011266
Merge pull request #8693 from mlorbetske/dev/mlorbe/UpdateTestTemplatesFor156
Update to the 15.6 RTM version of the test SDK in templates
2018-03-13 16:31:35 -07:00
Livar
e606c10013
Merge pull request #8630 from jayaranigarg/tpv2rtm15.6
Branding changes for  TestPlatform 15.6 RTM
2018-03-13 16:31:08 -07:00
Livar
0fee1ca867
Merge pull request #8755 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-03-13 16:30:40 -07:00
Livar
1f18611189
Merge pull request #8772 from dotnet/nuget.client.release-4982-1-1
Insert NuGet Build 4.7.0-preview1.4982 into cli
2018-03-13 16:30:23 -07:00
Peter Huene
075bf14db6
Merge branch 'release/2.1.1xx-MSRC' into release/2.1.1xx
* release/2.1.1xx-MSRC: (21 commits)
  Update to consume aspnetcore 2.0.6-10011
  Update SDK to 2.1.100-preview-62617-01
  Updating Roslyn to 2.7.0-beta3-62615-05
  Update FSharp Compiler
  Fix README.md for 2.1.1xx (#8600)
  MSBuild 15.6.82
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  Update fsharp
  Build trigger commit.
  Update to consume aspnetcore 2.0.6-10008 notimestamp build
  Update to consume aspnetcore 2.0.6-10008 timestamp build
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
  Making a document only commit to trigger another build of the CLI.
  Add 2.0.5 ASP.NET store to native installers.
  Update to consume aspnetcore 2.0.6-10007
  Fix Windows servicing builds.
  Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
  Update runtime and branding to 2.0.6.
  ...
2018-03-13 15:01:01 -07:00
Rohit Agrawal (NUGET)
c311381ab3 add nuget-build myget feed as source 2018-03-13 12:37:07 -07:00
Livar
3ebe4e552b
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-03-13 12:33:39 -07:00
Livar
a6b59938d4
Merge pull request #8771 from livarcocc/re_activate_resolver_tests
Re-activating the net461 tests for the Resolver
2018-03-13 11:54:37 -07:00
Livar
33d37666f6
Merge pull request #8768 from dotnet-bot/master-UpdateDependencies
Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26313-01, preview2-26313-01, preview2-26313-01, beta2-62713-01, respectively (master)
2018-03-13 10:20:22 -07:00
Livar
782354acf9
Removing left over comment. 2018-03-13 10:19:44 -07:00
John Beisner
dbcd83075c
Creating and publishing 'symbols.nuget' to the blob feed. (#8712)
* Creating and publishing '*.symbols.nuget' to the blob feed.

* Reverting 'generatenupkg' methodology.

* Fixing formatting...

* Overwrite should = 'false'

* Second draft - Creating and publishing '*.symbols.nuget' to the blob feed.

* Fixing a VS auto-update.

* Removing the 'Microsoft.SymbolUploader.Build.Task' modifications; need to make a PR just for this.

* Change "sdk.*.Microsoft.DotNet.SDK.*.symbols.nupkg" to "runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg"; removing the 'DotNetRestore' on the Symbols.csproj

* Removing a 'todo' comment...

* Putting back the 'dotnet restore'

* Fixing a typo...

* Logical separation of the 'nupkg' from the 'symbols.nupkg' enumeration; fixed 'swr' pattern.

* Add "BLOBFEED_STORAGE_CONTAINER"
2018-03-13 08:19:15 -07:00
dotnet-bot
70f2b13256 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26313-01, preview2-26313-01, preview2-26313-01, beta2-62713-01, respectively 2018-03-13 05:39:24 +00:00
NuGet Team Bot
90eed38b2d Insert NuGet Build 4.7.0-preview1.4982 into cli 2018-03-12 15:48:04 -07:00
Livar Cunha
a6db27bdd7 Re-activating the net461 tests for the Resolver in the hopes that the failures fixed themselves. 2018-03-12 15:06:25 -07:00
Livar Cunha
b0e57e1712 Re-activate templating test. 2018-03-12 13:16:45 -07:00
Livar
4f6a57f638
Merge pull request #8761 from dotnet-bot/master-UpdateDependencies
Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26311-02, preview2-26311-02, preview2-26311-02, beta2-62711-03, respectively (master)
2018-03-11 17:34:18 -07:00