Commit Graph

18061 Commits

Author SHA1 Message Date
Chris Ross 328b52d056
Remove redundant method 2020-01-17 12:52:50 -08:00
Chris R 4fb0a13618 Merge remote-tracking branch 'release/2.1' into 'release/3.1'
# Conflicts:
#	build/dependencies.props
#	eng/PatchConfig.props
#	src/Servers/Kestrel/Core/src/CoreStrings.resx
#	src/Servers/Kestrel/Core/src/Internal/HttpsConnectionAdapter.cs
#	src/Servers/Kestrel/Core/src/Properties/CoreStrings.Designer.cs
#	src/Servers/Kestrel/test/FunctionalTests/HttpsTests.cs
#	src/Shared/CertificateGeneration/CertificateManager.cs
#	src/Shared/CertificateGeneration/EnsureCertificateResult.cs
#	src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
#	src/Tools/dotnet-dev-certs/src/Program.cs
2020-01-17 10:51:34 -08:00
dotnet-maestro-bot 2dc908d502 [automated] Merge branch 'release/2.1' => 'release/3.1' (#18396)
* [Platform] Detect and fix certificates with potentially inaccessible keys on Mac OS (2.1) (#17560)

* [Https] Detects and fixes HTTPS certificates where the key is not guaranteed to be accessible across security partitions

* Fix dotnet dev-certs https --check

* Update logic for detecting missing certs

* Fix security command

* Update warning logic

* Check that the key is accessible in Kestrel

* Add correct link to docs

* Update src/Tools/dotnet-dev-certs/src/Program.cs

Co-Authored-By: Daniel Roth <daroth@microsoft.com>

* Update src/Tools/dotnet-dev-certs/src/Program.cs

Co-Authored-By: Daniel Roth <daroth@microsoft.com>

* Add test for 2.1

* Update src/Tools/dotnet-dev-certs/src/Program.cs

Co-Authored-By: Chris Ross <Tratcher@Outlook.com>

* Address feedback

* Fix non-interctive path

* Fix tests

* Remove a couple of test from an unshipped product

* Check only for certificates considered valid

* Switch the exception being caught, remove invalid test

Co-authored-by: Daniel Roth <daroth@microsoft.com>
Co-authored-by: Chris Ross <Tratcher@Outlook.com>

* Fix patchconfig merge (#18389)

* Fix flaky HubConnectionHandler test (#18391)

Co-authored-by: Javier Calvarro Nelson <jacalvar@microsoft.com>
Co-authored-by: Daniel Roth <daroth@microsoft.com>
Co-authored-by: Chris Ross <Tratcher@Outlook.com>
Co-authored-by: Brennan <brecon@microsoft.com>
2020-01-17 08:30:12 -08:00
Pranav K cd518e9da3 Use reference assemblies when compiling Razor views (#18395)
* Use reference assemblies when compiling Razor views
Fixes https://github.com/dotnet/aspnetcore/issues/18323

* Avoid mixing runtime and ref assembly
2020-01-16 17:56:14 -08:00
Brennan 28240ce460 Fix flaky HubConnectionHandler test (#18391) 2020-01-16 14:24:34 -08:00
Artak 452a822b62 Added the Blazor survey link to the Blazor-Server project template (#17434)
* Added the survey link to the Blazor Server project

* Use new survey link for server project

* Updated the baseline to include the SurveyPrompt.razor file

* Added the SurveyPrompt.razor to all the test baselines
2020-01-16 13:21:37 -08:00
John Luo bc7135c202
Merge pull request #18369 from dotnet/jkotalik/merge31
Merge 2.1 into 3.1
2020-01-16 11:29:26 -08:00
Pranav K 6a8ce3ad67 Add support for IAsyncEnumerable<T> where T is value type (#17154) (#17563)
* Add support for IAsyncEnumerable<T> where T is value type (#17154)

* Add support for IAsyncEnumerable<T> where T is value type

Fixes https://github.com/aspnet/AspNetCore/issues/17139

* Fixup ref asm

* undo changes to blazor.server.js
2020-01-16 10:32:29 -08:00
Javier Calvarro Nelson 8e5767bdf1 [Platform] Detect and fix certificates with potentially inaccessible keys on Mac OS (3.1) (#17581)
* [Platform] Add logic to dotnet-dev-certs to detect and fix certificates with inaccessible keys on Mac OS

* Update the docs link
2020-01-16 10:29:37 -08:00
John Luo 4682c2a6dc Test ref pack fix 2020-01-16 08:51:35 -08:00
Javier Calvarro Nelson 7f53f7e95b [Platform] Detect and fix certificates with potentially inaccessible keys on Mac OS (2.1) (#17560)
* [Https] Detects and fixes HTTPS certificates where the key is not guaranteed to be accessible across security partitions

* Fix dotnet dev-certs https --check

* Update logic for detecting missing certs

* Fix security command

* Update warning logic

* Check that the key is accessible in Kestrel

* Add correct link to docs

* Update src/Tools/dotnet-dev-certs/src/Program.cs

Co-Authored-By: Daniel Roth <daroth@microsoft.com>

* Update src/Tools/dotnet-dev-certs/src/Program.cs

Co-Authored-By: Daniel Roth <daroth@microsoft.com>

* Add test for 2.1

* Update src/Tools/dotnet-dev-certs/src/Program.cs

Co-Authored-By: Chris Ross <Tratcher@Outlook.com>

* Address feedback

* Fix non-interctive path

* Fix tests

* Remove a couple of test from an unshipped product

* Check only for certificates considered valid

* Switch the exception being caught, remove invalid test

Co-authored-by: Daniel Roth <daroth@microsoft.com>
Co-authored-by: Chris Ross <Tratcher@Outlook.com>
2020-01-15 22:54:11 -08:00
Ryan Brandenburg 5dc2d6eafa Extend timeout and report failure to WarmUp for template tests (#16759)
* Extend timeout and report failure to WarmUp for template tests

* Retry click events
2020-01-15 18:44:56 -08:00
Justin Kotalik d9ccf235fd Final bad conflicts 2020-01-15 16:39:50 -08:00
Justin Kotalik ca56fee980 Missed conflicts 2020-01-15 16:26:32 -08:00
Justin Kotalik 4dd0a6cd27 Merge branch 'release/2.1' into release/3.1 2020-01-15 16:19:30 -08:00
Hao Kung 109663e078 Send confirmation mails for external accounts 2020-01-15 13:32:34 -08:00
William Godbe 89d26402ef
[release/3.1] Mark Blazor packages as nonshipping (#18357)
* Mark Blazor packages as nonshipping

* Explicitly set IsShippingPackage=false

* Pin blazor dependency version
2020-01-15 12:11:52 -08:00
John Luo 9522e1dd2e Multi-target all shared framework projects with netcoreapp3.1 (#17998)
- regen ref
2020-01-15 12:08:17 -08:00
Javier Calvarro Nelson b4d2f9aa52 [Static Web Assets] Allow assets with empty base paths (#17414) 2020-01-15 11:45:21 -08:00
Ajay Bhargav B cba11d7e22 Workaround for #18058 (#18213) 2020-01-15 11:42:30 -08:00
James Newton-King 34294a3e7a Fix TestServer hang with duplex streaming requests (#17158) 2020-01-15 11:08:41 -08:00
Chris Ross ad8ecf96a1 React to runtime/594 Encoder.Convert change (#17747) 2020-01-15 11:07:50 -08:00
Chris Ross 8211a1c313 [2.1] CookieChunkingManager needs to flow the Secure attribute… (#17953) 2020-01-15 11:07:15 -08:00
Brennan 164ddfd48b Fix flaky LongPolling tests (#14395) 2020-01-15 11:06:16 -08:00
William Godbe 6ec28e8715
Fix setter for CandidateState.Values in reference assembly (#18278) 2020-01-15 11:02:08 -08:00
William Godbe ee57a0c309
Use checked-in platform manifest in 3.1.2 (#18250)
* Use checked-in platform manifest in 3.1.2

* Only used checked-in manifest in servicing builds
2020-01-15 11:01:16 -08:00
= eb1150ba37 Fixup templates 2020-01-15 09:00:39 -08:00
John Luo 183a09f763 Update branding to 2.1.16 2020-01-14 14:42:47 -08:00
DotNet Bot 1324674163 Merged PR 4703: [internal/release/3.1] Update dependencies from 1 repositories
This pull request updates the following dependencies

[marker]: <> (Begin:48752c90-f78c-49ee-575f-08d76e1d56cb)
## From https://github.com/aspnet/EntityFrameworkCore
- **Build**: 20191210.7
- **Date Produced**: 12/10/2019 8:25 PM
- **Commit**: 813358a5fb4e1f35e5d82463d2bad6616ca6f594
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
  - **Microsoft.EntityFrameworkCore.Tools** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.SqlServer** -> 3.1.1-servicing.19610.7
  - **dotnet-ef** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.InMemory** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.Relational** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.Sqlite** -> 3.1.1-servicing.19610.7

[marker]: <> (End:48752c90-f78c-49ee-575f-08d76e1d56cb)
2019-12-15 17:23:03 +00:00
dotnet-bot 0780fb8e44 Merge in 'release/3.1' changes 2019-12-14 01:57:19 +00:00
Doug Bunting 81bccd1e4a
Merge branch 'release/3.0' => 'release/3.1' #16621
- hurray 🎆 🍾
- thanks @wtgodbe 
/fyi @Pilchie @mmitche
2019-12-13 17:55:58 -08:00
dotnet-bot 95be2bded3 Merge in 'release/3.1' changes 2019-12-14 00:23:13 +00:00
William Godbe f89c8d15a2
Use correct, non-stabilized version to find runtime archive (#17863) (#17869) 2019-12-13 16:21:45 -08:00
wtgodbe 6ce4719886 Fixup nuspecs for TargetingPackPackage/SharedFrameworkPackage 2019-12-13 16:19:53 -08:00
wtgodbe e142091d27 Add StructLayout to LifeCycleProperty 2019-12-13 14:46:00 -08:00
William Godbe fcb22728ee Add dummy target for GetTargetPath to Components.Web.JS.npmproj (#17796) 2019-12-13 14:04:42 -08:00
wtgodbe 138e801e34 Remove _dummy/_dummyPrimitive from LifeCycleProperty 2019-12-13 13:35:43 -08:00
wtgodbe a3358d71cd Try ugly fix for LifecycleProperty 2019-12-13 13:26:24 -08:00
wtgodbe 7052bc48d4 Try ugly fix for LifecycleProperty 2019-12-13 13:19:27 -08:00
Doug Bunting f2f23589a6
Use fields in a `readonly` `struct` 2019-12-13 12:56:23 -08:00
Doug Bunting a11d4b32ad
Add another CS1705 workaround in test project depending on some .NET Standard projects 2019-12-13 12:13:56 -08:00
Doug Bunting 3a67489398
Add missing `_dummy` and `_dummyPrimitive` fields
- probably need to double-check for similar gaps in 'release/3.0' branch
2019-12-13 12:13:15 -08:00
Doug Bunting 7256b353b3
Update `internal` types and members in *.Manual.cs files
- match changes that are in 'release/3.1' but not 'release/3.0'
  - e.g. `StaticComponentRenderer`'s namespace change and newly-added members
- redo GenAPI exclusions
  - remove some unecessary workarounds getting in the way of keeping up w/ API changes
  - add more GenAPI exclusions, enabling `--all` without hitting dotnet/arcade#4488
2019-12-13 12:10:44 -08:00
Doug Bunting 7ba757265f
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
- upgrade Arcade SDK to '1.0.0-beta.19607.3'
- regenerate eng/ProjectReferences.props and ref/ projects
2019-12-11 20:03:03 -08:00
Doug Bunting cf6b5028c3
Improve generation and use of ref/ projects (#17311)
* Remove useless src/PackageArchive files
- not used outside 2.x branches

* Improve use of ref/ assemblies
- compile against ref/ assemblies but do not change package metadata
  - update the metadata of implementation projects to include the ref/ assembly path
  - update `@(ReferenceAssembly)` metadata for Extensions packages, not `@(PackageReference)`
  - can be disabled using `$(CompileUsingReferenceAssemblies)` e.g. when generating ref/ projects
- include ref/ projects in source build by default
  - remove `$(ExcludeFromSourceBuild)` overrides from ref/ project files
- use latest package references and use project references even when _not_ building the targeting packs
- restore previous `@(Reference)` -> `@(PackageReference)` logic
  - add build-only Microsoft.Internal.Extensions.Refs package reference in most cases
- remove IndirectReferences.props and `@(_ExtensionInternalRefAssemblies)`; no longer needed

* Improve ref/ project generation
- use ../src/**/AssemblyInfo.cs files instead of including attributes in *.Manual.cs files
  - for same reason, copy `@(InternalsVisibleto)` items from src/ to ref/ projects
- use eng/targets/CSharp.ReferenceAssembly.props instead of ref/Directory.Build.props files
- use TFM-specific *.Manual.cs files in ref/ project files instead of ref/Directory.Build.props files

optimizations and usability improvements:
- add `$(BuildMainlyReferenceProviders)` property to focus on reference providers when generating ref/ projects
- disable `$(UseReferenceAssemblyInImplementation)` to avoid using ref/ projects while generating them

nits:
- clean up whitespace and remove blank lines in ref/ project files

* Perform smaller cleanup
- remove `$(IsTargetingPackPatching)`; use only `$(IsTargetingPackBuilding)`
- remove `$(DisableServicingFeatures)`; enable the servicing features we need
  - suppress baseline references even in servicing builds
- restore `$(AdditionalGenApiCmdOptions)`; useful when updating *.Manual.cs files

nits:
- simplify conditions using `$(HasReferenceAssembly)`
- correct spelling in comments
- shorten long lines

* Use a response file for GenAPI commands
- work around dotnet/arcade#4021 and help with additional ref assemblies
- mimic 111462e0c2 and integrate w/ other changes here

* Undo some manual ref/ project changes
- now done automatically or centrally
- remove manual `[TypeForwardedTo]` and `[InternalsVisibleTo]` attributes
  - fully qualify a type now that `using` is gone
- remove dupe `@(Compile)` items for *.Manual.cs files; included in the ref/ project files
- remove redundant `$(AllowUnsafeBlocks)` and `$(NoWarn)` settings

nits:
- rename a *.Manual.cs file that's not TFM-specific
- remove `private` members

* Correct use of `@(ProjectReference)` items for reference providers
- use `@(Reference)` instead

* Remove recently-added `@(Compile)` and `@(Reference)` items
- were added due to missing `[InternalsVisibleTo]` attributes in ref/ assemblies or as early workarounds
  - plus, now transitive references **Just Work™️**
- expose `ClosedGenericMatcher` in the usual (*.Manual.cs) way
- also undo Microsoft.Extensions.ApiDescription.Server workaround

* Remove `private` members from ref/ *.Manual.cs files
- not useful and bloat the ref/ assemblies

* Cleanup warnings
- avoid "CSC warning CS2008: No source files specified." building site extensions
- correct warnings (as errors) about `RenderToStringResult` being obsolete
  - add Microsoft.AspNetCore.SpaServices.Tests to Middleware solution

* Remove `@(RuntimeHostConfigurationOption)` workarounds
- deps files are unaffected by new ref/ assembly handling and test projects aren't special-cased
- also execute a test previously skipped due to deps file problems

* Regenerate ref/ projects
- pick up the latest generation changes

(unclear why Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs changed but works)

* Fill in missing `internal` types 1 of n
- rename Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs; need `RenderTreeFrame` type everywhere
- add types needed in unit and perf tests to *.Manual.cs files

* Clean up recent commits
- remove recently-added `private` members
- restore `_dummyPrimitive` fields in Microsoft.AspNetCore.Server.HttpSys.Manual.cs

* Add *.Manual.cs files for more projects

* !fixup! fields in *.Manual.cs `struct`s
- GenAPI sometimes generates `_dummy` and `_dummyPrimitive` fields _instead of_ visible members
- what GenAPI generates sometimes have the right length but actual fields don't hurt
  - that is, using the real fields corrects both the visible API and `struct`s' sizes

nits:
- consolidate `namespace`s in Microsoft.AspNetCore.Mvc.Core.Manual.cs

* Remove special case for generating ref/ projects on non-Windows
- referenced issue was closed with no action but workaround still not required
- no tabs in generated content

* Only create ref/ projects for assemblies in the shared framework
- restrict when `$(HasReferenceAssembly)` is `true` by default
- add warnings when `$(IsAspNetCoreApp)` or `$(HasReferenceAssembly)` have unexpected values

* Remove "extra" ref/ projects
- associated implementation projects no longer have `$(HasReferenceAssembly)` set to `true`

* Add a few GenAPI exclusions
- see dotnet/arcade#4488
- generation for these members leads to NREs

* Add more `internal` types and members
- Identity/Core
- Identity/Extensions.Core
- Mvc/Mvc.ViewFeatures

* Add direct dependencies to work around CS1705 errors
- add direct references to some test and sample projects to make intent clear i.e. address CS1705 root cause
  - these projects must use implementation assemblies for those direct references
  - requirement also applies to anything depending on them e.g. functional tests
  - for simplicity, use `$(CompileUsingReferenceAssemblies)` instead of targeted `@(Reference)` metadata
- leads to ~40 projects that do not themselves add ref/ metadata
  - this is _not_ transitive i.e. it applies only to projects that override `$(CompileUsingReferenceAssemblies)`

* nits: Remove a few more `private` members in *.Manual.cs files

* !fixup! correct namespaces of a few types in *.Manual.cs files

* Try another way to fix Microsoft.AspNetCore.Blazor.Build.Tests

* Try another way to fix missing targets in Web.JS.npmproj
2019-12-11 07:36:59 -08:00
John Luo 3cfac251c7 Merge branch 'release/2.1' into release/3.0 2019-12-09 14:38:04 -08:00
dotnet-bot f6f3f6f122 Merge in 'release/3.1' changes 2019-12-05 20:44:46 +00:00
William Godbe 1f114dff50
Download runtime from suffixed location in dotnetcli blob storage (#17592) 2019-12-05 12:33:38 -08:00
Will Godbe 90aa91ab8c Merged PR 4684: Merge 'release/3.1' into internal branch
Fixed a merge conflict in the code mirror from github into 'internal/release/3.1'
2019-12-05 02:27:14 +00:00
William Godbe 89aae45d6d
Download runtime from suffixed location in dotnetcli blob storage (#17593) 2019-12-04 16:31:45 -08:00