Commit Graph

12 Commits

Author SHA1 Message Date
Martin Costello a0ede85a61
Fix MSB4109 (#25880)
Fix MSB4109 error when the Microsoft.Extensions.ApiDescription.Server NuGet package is installed.
2020-09-14 12:07:15 -07:00
Doug Bunting 1f84e28882
Use `$(TargetFrameworkIdentifier)` and `$(TargetFrameworkVersion)` consistently (#25428)
- always use `$([MSBuild]::VersionXYZ(...))` for version checks
- use `$(NETCoreAppFrameworkIdentifier)` where it's available
- move `$(KnownAppHostPackOrFrameworkReferenceTfm)` setting to Directory.Build.props
  - use it to correct `@(KnownFrameworkReference)` updates
  - metadata of those items still uses `netcoreapp5.0`
  - see also https://github.com/dotnet/efcore/pull/22279#discussion_r478674176

nits:
- do not assume `$(TargetFrameworkVersion)` starts with a 'v'; valid w/o it
- add `$(_IsMicrosoftNETCoreApp20OrOlder)` property in OpenAPI targets file
  - evaluate the `Condition` once instead of three times
2020-08-31 11:36:19 -07:00
William Godbe ce058f639c
Add net461 TFM to netstandard2.0 projects (#25094)
* Add net461 TFM to netstandard2.0 projects

* Fix a couple of errors

* Fix some errors

* Get rid of Sockets reference

* Respond to feedback

* net461 -> property

* Fixup clientSample

* Remove net461 from analyzers/razor

* Remove net461 from test projects

* Feedback

* Add net461 test configs

* Remove some incompatible test configs

* Fix test
2020-08-27 16:05:40 -07:00
Doug Bunting e13368391b
Keep `@(Reference)` metadata when creating `@(ProjectReference)` items (#21567)
- #20818, fix e.g. references to Microsoft.Web.Xdt.Extensions in our packages
- make `@(Reference)` items much more broadly applicable
- emit an error when `@(ProjectReference)` is used instead of `@(Reference)`
    - then get rid of the errors (!!)
- rename a couple of projects to match their assembly names
    - then regenerate the `@(ProjectReferenceProvider)` items
- switch intersection approach from Exclude / Exclude to Copy / Update / Copy

Projects of particular interest:
- src/DefaultBuilder/src/Microsoft.AspNetCore.csproj
    - honouring metadata left e.g. Microsoft.AspNetCore.Components.WebAssembly.DevServer package unchanged
    - removed redundant metadata after that confirmation
- src/Razor/tools/Microsoft.AspNetCore.Razor.Internal.Transport/
    - content of this package unchanged but metadata avoids extra work
    - add a comment about the extra work
- src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/
    - success! removes Microsoft.Web.Xdt.Extensions dependency from the package
- src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
    - add a `Condition` to avoid an ordering issue I hit here
- src/Tools/Extensions.ApiDescription.Server/src/
    - avoid errors the new build ordering and timing caused

Separately, up the timeout in the `<DownloadFile />` task
- hit repeated timeouts downloading dotnet-runtime-5.0.0-rc.1.20370.4-win-x64.zip

nits:
- remove dupe `@(Reference)` item in Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
- remove useless `%(ProjectReference.IsImplicitlyDefined)` metadata as well as its misspellings
- remove extra spaces from ProjectReferences.props
- clean up a few comments in ResolveReferences.targets

* !fixup! Correct other references to renamed projects
2020-08-04 10:05:55 -07:00
Doug Bunting c4c6e25a06
Add missing doc files and cleanup nits (#22931)
* nit: Remove useless `$(HasReferenceAssembly)` settings
  - set in /Directory.Build.targets
    - `true` only in `$(IsAspNetCoreApp)` projects
* nit: Remove useless `$(CompileUsingReferenceAssemblies)` settings
  - no current versioning differences between ref/ and src/ assemblies when targeting default TFM
* Add more `$(GenerateDocumentationFile)` settings
  - increases the number of generated doc files, mostly without problems
- !fixup! correct typo in `DebugProxyHost` doc comments
    - was not generating a doc file before
  - remove previous (ineffective) src/Components/Directory.Build.targets setting
  - nit: remove a duplicate `$(GenerateDocumentationFile)` setting
* nit: Remove useless `$(IsPackable)` settings
  - only analyzers and implementation projects are packable by default
    - main use case for explicit setting is projects shipping only in shared framework
  - conditional setting in src/Mvc/Directory.Build.props just subset logic in /Directory.Build.targets
* nit: Remove useless `$(IsProjectReferenceProvider)` settings
  - only implementation projects are providers by default
* nit: Remove useless `$(IsTestAssetProject)` settings
  - set in src/Mvc/test/WebSites/Directory.Build.props
* !fixup! Looks like `InProcessNewShimWebSite` must compile w/o ref/ assemblies
  - restore `$(CompileUsingReferenceAssemblies)` in this one project
2020-06-17 13:04:45 -07:00
Brennan Conroy 2d066dcd3e Apply some fixes 2020-02-19 14:18:29 -08:00
dotnet-maestro-bot affd7e00df [automated] Merge branch 'release/3.1' => 'master' (#15394)
* [release/3.1] Update dependencies from 3 repositories (#15218)

* Update dependencies from https://github.com/dotnet/arcade build 20191017.3

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19517.3
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19517.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19517.3

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.2

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.2
- dotnet-ef - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.2
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.2

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.4

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.4
- dotnet-ef - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.4
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.4

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.5

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.5
- dotnet-ef - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.5
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.5

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.7

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.7
- dotnet-ef - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.7
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.7

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.8

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.8
- dotnet-ef - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.8
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.8

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.9

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.9
- dotnet-ef - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.9
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.9

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.11

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.11
- dotnet-ef - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.11
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.11

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.12

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.12
- dotnet-ef - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.12
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.12

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191021.13

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19521.13
- dotnet-ef - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19521.13
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19521.13

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.1

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.1
- dotnet-ef - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.1
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.1

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191022.3

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19522.3
- dotnet-ef - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19522.3
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19522.3

* Remove duplicate icon url

* Remove more duplicate icon elements

* Remove more package icons

* Remove packageIcon

* Update dependencies from https://github.com/aspnet/Blazor build 20191023.1

- Microsoft.AspNetCore.Blazor.Mono - 3.1.0-preview2.19523.1

* Undo bad deletion of eng/common file

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191023.2

- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.0-preview2.19523.2
- Microsoft.AspNetCore.Razor.Language - 3.1.0-preview2.19523.2
- Microsoft.CodeAnalysis.Razor - 3.1.0-preview2.19523.2
- Microsoft.NET.Sdk.Razor - 3.1.0-preview2.19523.2

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191023.7

- Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview2.19523.7
- Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview2.19523.7
- dotnet-ef - 3.1.0-preview2.19523.7
- Microsoft.EntityFrameworkCore - 3.1.0-preview2.19523.7
- Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview2.19523.7
- Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview2.19523.7
- Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview2.19523.7

* [ApiAuth] Fix subscription callbacks when unsubscribe (#15194)

re-assigned the callback array to itself after running splice on it when a client unsubscribed from notifications.

* Update doc references in Auth action results (#15110)

* Rebrand for 3.1.0-preview3

- aspnet/AspNetCore-Internal#3281

* [Templating][Fixes #15349] Update SPA templates to use generic host (#15365)

* [Blazor] Reliability improvements for the E2E tests (#15320)

* Fix race with CTS disposing (#11757)

* Nuke helix arm runs on 3.1 (#15390)

* [Blazor][Fixes #14959] NavLink match should be case-insensitive (#15401)
2019-10-25 13:50:53 -07:00
wtgodbe 8c49f8937d Add icon metadata to manually generated .nuspecs 2019-09-24 13:31:51 -07:00
wtgodbe ff61a43031 Merge branches 2019-09-24 13:26:49 -07:00
Doug Bunting 8417429b9b
Fix a typo and address remaining service reference TODO items (#13364)
- #4923
- typo caused problems when cleaning files
- add `%(OpenApiProjectReference.GlobalPropertiesToRemove)` metadata
  - stop removing `$(Configuration)` or `$(Platform)` global properties
- address timing issues cropping up occasionally in builds using service ref features
  - avoid `AfterTargets="Build"`; referencing projects sometimes continue while post-build work is done
    - instead use `BeforeTargets="Build"` since that's a no-op target wrapping up a build
- set only properties in buildMultiTargeting\Microsoft.Extensions.ApiDescription.Server.targets
  - items not evaluated early enough to reference in all cases
- rename Microsoft.Extensions.ApiDescription.Client tasks
- remove net461 task assembly
2019-08-23 15:59:58 -07:00
Doug Bunting e89a0519b9 Use Microsoft.Extensions.CommandLineUtils and Microsoft.Extensions.Tools.Internal in service ref programs
- add '--quiet' option
- add '--debug' option (when building Debug configuration)
- support `--` in `dotnet-getdocument`; users may want to explictly add options for GetDocument.Insider
- remove '--no-color' option
- use `IReporter` extension methods instead of static `Reporter` class
- reduce `static` use to ease testing (coming soon) and share the `IConsole` and `IReporter`
  - add `ProgramBase`
- allow mix of known and unknown command-line arguments
  - maintain existing behaviour using switch added in aspnet/Extensions#2210

nits:
- add a couple more `CommandLineApplicationExtensions` methods
- take VS suggestions
2019-08-23 15:54:55 -07:00
Doug Bunting 04b1adbc2e
Move service reference projects into Tools directory (#13185)
- start of #4914 and #4896
- make infrastructure more accessible to these projects
- update list of projects
  - run `.\eng\scripts\GenerateProjectList.ps1`
2019-08-16 19:05:37 -07:00