Extensions consolidation #32912

maryamariyan · 2020-02-27T12:22:48Z

Bring over commit history from Extensions repo
Thin out ported Extensions code by removing unused files
Enable incremental build of Extensions projects

…ge/release/3.0-to-master [automated] Merge branch 'release/3.0' => 'master' Commit migrated from dotnet/extensions@14efea2

…ge/release/3.0-preview9-to-release/3.0 [automated] Merge branch 'release/3.0-preview9' => 'release/3.0' Commit migrated from dotnet/extensions@a459d9e

…ge/release/3.0-to-master [automated] Merge branch 'release/3.0' => 'master' Commit migrated from dotnet/extensions@a070a81

Commit migrated from dotnet/extensions@c731d57

- no-op merge, no reason to wait Commit migrated from dotnet/extensions@7f64f14

…#2080) Commit migrated from dotnet/extensions@4254b86

…/3.0 Commit migrated from dotnet/extensions@07c506d

…ns#2226) - no-op merge Commit migrated from dotnet/extensions@44f2dd8

- no-op merge Commit migrated from dotnet/extensions@8f37920

Commit migrated from dotnet/extensions@887ce4f

- no-op merge Commit migrated from dotnet/extensions@39d5064

Commit migrated from dotnet/extensions@3940ade

- brings newer Arcade Commit migrated from dotnet/extensions@4afab35

Commit migrated from dotnet/extensions@8b04320

Commit migrated from dotnet/extensions@7f4859e

…ge/release/3.0-to-master [automated] Merge branch 'release/3.0' => 'master' Commit migrated from dotnet/extensions@12a28e4

Commit migrated from dotnet/extensions@033ea04

…ge/release/3.0-to-master [automated] Merge branch 'release/3.0' => 'master' Commit migrated from dotnet/extensions@d8590b1

Commit migrated from dotnet/extensions@ae3a22b

Commit migrated from dotnet/extensions@9442298

…ge/release/3.0-to-master [automated] Merge branch 'release/3.0' => 'master' Commit migrated from dotnet/extensions@fb7fdf5

Commit migrated from dotnet/extensions@f8ba700

- no-op merge Commit migrated from dotnet/extensions@b7f895d

Commit migrated from dotnet/extensions@5dbc609

- no-op merge Commit migrated from dotnet/extensions@04a22bf

Commit migrated from dotnet/extensions@d838533

- brings new Microsoft.Data.SqlClient version Commit migrated from dotnet/extensions@3347747

Commit migrated from dotnet/extensions@2220e1a

- no-op merge Commit migrated from dotnet/extensions@3f880fd

- new Arcade Commit migrated from dotnet/extensions@c2147ae

Commit migrated from dotnet/extensions@cec6e75

Commit migrated from dotnet/extensions@321a30c

Commit migrated from dotnet/extensions@d525539

These lines were removed unexpectedly by the automated file header code fix. Commit migrated from dotnet/extensions@738f2d6

Switch to MIT license Commit migrated from dotnet/extensions@f406602

Dotnet-GitSync-Bot · 2020-02-27T12:23:08Z

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

jkotas · 2020-02-27T14:47:37Z

Are we also going to fix the directory structure to follow the libraries conventions? I guess it may be part of the "making the build work" because the build scripts assume the convention in number of places.

ericstj · 2020-02-27T16:54:45Z

Yes we plan to make these match the libraries structure.

ericstj · 2020-02-29T00:54:54Z

Structure looks good in this one. I also spot checked "blame" on a few files and it looks the same between extensions and runtime. 👍 👍 👍

…-total'

…tally - BinPlacing for Extensions projects - Ignore building Microsoft.Extensions. projects - Use correct StringNameKeyId for Extensions projects - Separate packaging path for extensions projects - Add PreReleaseVersionIteration

ericstj · 2020-03-02T21:10:48Z

eng/Versions.props

@@ -8,6 +8,7 @@
    <PatchVersion>0</PatchVersion>
    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
    <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">$(PreReleaseVersionIteration)-runtime</PreReleaseVersionIteration>


@JunTaoLuo here's the workaround we're going to use temporarily to permit package overlap between extensions and runtime.

Sounds good

ericstj · 2020-03-02T21:11:36Z

src/libraries/Directory.Build.props

+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\ref\**\Microsoft.Extensions.*proj" Exclude="@(PortedExtensionsProject)" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\src\**\Microsoft.Extensions.*proj" Exclude="@(PortedExtensionsProject)" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\Microsoft.Extensions.*.Tests.csproj" Exclude="@(PortedExtensionsProject)" />
+  </ItemGroup>


Nice place to put the central workaround for the traversal projects while you bring them up 👍 👍 👍

ericstj · 2020-03-02T21:12:54Z

src/libraries/Directory.Build.props

@@ -311,6 +322,9 @@
    <!-- Paths to binplace package content -->
    <NETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\ref</NETCoreAppPackageRefPath>
    <NETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\lib</NETCoreAppPackageRuntimePath>
+
+    <ASPNETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\aspnetcoreapp\ref</ASPNETCoreAppPackageRefPath>


This could use a comment, but you can add it when you submit the PR that introduces the extensions transport package.

ericstj

LGTM

wtgodbe and others added 30 commits August 22, 2019 15:09

Merge pull request dotnet/extensions#2219 from dotnet-maestro-bot/mer…

3f80448

…ge/release/3.0-to-master [automated] Merge branch 'release/3.0' => 'master' Commit migrated from dotnet/extensions@14efea2

Merge pull request dotnet/extensions#2216 from dotnet-maestro-bot/mer…

fd3c939

…ge/release/3.0-preview9-to-release/3.0 [automated] Merge branch 'release/3.0-preview9' => 'release/3.0' Commit migrated from dotnet/extensions@a459d9e

Merge pull request dotnet/extensions#2220 from dotnet-maestro-bot/mer…

a1e6309

…ge/release/3.0-to-master [automated] Merge branch 'release/3.0' => 'master' Commit migrated from dotnet/extensions@a070a81

Merge branch 'master' into merge/release/3.0-to-master

69f0b11

Commit migrated from dotnet/extensions@c731d57

Merge branch 'release/3.0' => 'master' (dotnet/extensions#2222)

a45878a

- no-op merge, no reason to wait Commit migrated from dotnet/extensions@7f64f14

Fix dotnet/extensions#2044 by updating doc comment (dotnet/extensions…

10c6124

…#2080) Commit migrated from dotnet/extensions@4254b86

Merge branch 'release/3.0' into merge/release/3.0-preview9-to-release…

7578412

…/3.0 Commit migrated from dotnet/extensions@07c506d

Merge branch 'release/3.0-preview9' => 'release/3.0' (dotnet/extensio…

07e8a46

…ns#2226) - no-op merge Commit migrated from dotnet/extensions@44f2dd8

Merge branch 'release/3.0' => 'master' (dotnet/extensions#2228)

47956ea

- no-op merge Commit migrated from dotnet/extensions@8f37920

Merge branch 'master' into merge/release/3.0-to-master

d58fb21

Commit migrated from dotnet/extensions@887ce4f

Merge branch 'release/3.0' => 'master' (dotnet/extensions#2229)

ca56f2e

- no-op merge Commit migrated from dotnet/extensions@39d5064

Merge branch 'master' into merge/release/3.0-to-master

cc63097

Commit migrated from dotnet/extensions@3940ade

Merge branch 'release/3.0' => 'master' (dotnet/extensions#2233)

0a07165

- brings newer Arcade Commit migrated from dotnet/extensions@4afab35

Corrected casing in comment. (dotnet/extensions#2235)

2f1fc86

Commit migrated from dotnet/extensions@8b04320

Merge branch 'master' into merge/release/3.0-to-master

82e4269

Commit migrated from dotnet/extensions@7f4859e

Merge pull request dotnet/extensions#2239 from dotnet-maestro-bot/mer…

b29f4e1

…ge/release/3.0-to-master [automated] Merge branch 'release/3.0' => 'master' Commit migrated from dotnet/extensions@12a28e4

Add XML Docs for pubternal types

9fc548b

Commit migrated from dotnet/extensions@033ea04

Merge pull request dotnet/extensions#2240 from dotnet-maestro-bot/mer…

bec0c1f

…ge/release/3.0-to-master [automated] Merge branch 'release/3.0' => 'master' Commit migrated from dotnet/extensions@d8590b1

Merge branch 'master' into merge/release/3.0-to-master

197cc5b

Commit migrated from dotnet/extensions@ae3a22b

Merge branch 'release/3.0' => 'master' (dotnet/extensions#2242)

244fe58

Commit migrated from dotnet/extensions@9442298

Merge pull request dotnet/extensions#2246 from dotnet-maestro-bot/mer…

3b8db3a

…ge/release/3.0-to-master [automated] Merge branch 'release/3.0' => 'master' Commit migrated from dotnet/extensions@fb7fdf5

Merge branch 'master' into merge/release/3.1-to-master

ff62677

Commit migrated from dotnet/extensions@f8ba700

Merge branch 'release/3.1' => 'master' (dotnet/extensions#2249)

5adfade

- no-op merge Commit migrated from dotnet/extensions@b7f895d

Merge branch 'master' into merge/release/3.1-to-master

e7e393c

Commit migrated from dotnet/extensions@5dbc609

Merge branch 'release/3.1' => 'master' (dotnet/extensions#2256)

9def091

- no-op merge Commit migrated from dotnet/extensions@04a22bf

Merge branch 'master' into merge/release/3.1-to-master

d378108

Commit migrated from dotnet/extensions@d838533

Merge branch 'release/3.1' => 'master' (dotnet/extensions#2261)

b761d9b

- brings new Microsoft.Data.SqlClient version Commit migrated from dotnet/extensions@3347747

Merge branch 'master' into merge/release/3.1-to-master

916de85

Commit migrated from dotnet/extensions@2220e1a

Merge branch 'release/3.1' => 'master' (dotnet/extensions#2264)

69ba608

- no-op merge Commit migrated from dotnet/extensions@3f880fd

Merge branch 'release/3.1' => 'master' (dotnet/extensions#2270)

3ceeb79

- new Arcade Commit migrated from dotnet/extensions@c2147ae

sharwell and others added 5 commits February 26, 2020 11:05

Normalize all file headers to the expected Apache 2.0 license

e3d4dfe

Commit migrated from dotnet/extensions@cec6e75

Switch file headers to the MIT license

78c05c3

Commit migrated from dotnet/extensions@321a30c

Update license in reference assemblies

af59643

Commit migrated from dotnet/extensions@d525539

Restore blank lines

74431bc

These lines were removed unexpectedly by the automated file header code fix. Commit migrated from dotnet/extensions@738f2d6

Merge pull request dotnet/extensions#3028 from sharwell/mit-license

519d931

Switch to MIT license Commit migrated from dotnet/extensions@f406602

Dotnet-GitSync-Bot added area-Meta new-api-needs-documentation labels Feb 27, 2020

maryamariyan force-pushed the primitives-total branch from 0e6d7fd to 091eee0 Compare February 28, 2020 21:49

maryamariyan added new-api-needs-documentation and removed new-api-needs-documentation labels Mar 1, 2020

Merge branch 'runtime-consolidation' from Extensions into 'primitives…

1650655

…-total'

maryamariyan force-pushed the primitives-total branch from 091eee0 to 1650655 Compare March 2, 2020 07:20

maryamariyan force-pushed the primitives-total branch from 6264b65 to 3df8292 Compare March 2, 2020 07:50

maryamariyan marked this pull request as ready for review March 2, 2020 08:15

jaredpar mentioned this pull request Mar 2, 2020

Fast patching NuGet restore issue dotnet/arcade#4957

Closed

ericstj reviewed Mar 2, 2020

View reviewed changes

ericstj approved these changes Mar 2, 2020

View reviewed changes

maryamariyan merged commit e3ffd34 into dotnet:master Mar 2, 2020

maryamariyan added area-Microsoft.Extensions and removed area-Meta labels Mar 25, 2020

maryamariyan added area-Meta and removed area-Microsoft.Extensions labels Nov 5, 2020

ghost locked as resolved and limited conversation to collaborators Dec 10, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extensions consolidation #32912

Extensions consolidation #32912

maryamariyan commented Feb 27, 2020 •

edited

Loading

Dotnet-GitSync-Bot commented Feb 27, 2020

jkotas commented Feb 27, 2020

ericstj commented Feb 27, 2020

ericstj commented Feb 29, 2020

ericstj Mar 2, 2020

JunTaoLuo Mar 2, 2020

ericstj Mar 2, 2020

ericstj Mar 2, 2020

ericstj left a comment

Extensions consolidation #32912

Extensions consolidation #32912

Conversation

maryamariyan commented Feb 27, 2020 • edited Loading

Dotnet-GitSync-Bot commented Feb 27, 2020

jkotas commented Feb 27, 2020

ericstj commented Feb 27, 2020

ericstj commented Feb 29, 2020

ericstj Mar 2, 2020

Choose a reason for hiding this comment

JunTaoLuo Mar 2, 2020

Choose a reason for hiding this comment

ericstj Mar 2, 2020

Choose a reason for hiding this comment

ericstj Mar 2, 2020

Choose a reason for hiding this comment

ericstj left a comment

Choose a reason for hiding this comment

maryamariyan commented Feb 27, 2020 •

edited

Loading