Skip to content

2.1: Merge Localization, BasicMiddleware, and Identity #4345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1,889 commits into from
Dec 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1889 commits
Select commit Hold shift + click to select a range
d968fdd
[Fixes #1580, #1581] Update Identity UI to use Razor precompilation
javiercn Jan 20, 2018
5079f70
[Fixes #1583] Add authorization to the default Identity UI
javiercn Jan 20, 2018
df4db2f
Fix manage views layout
javiercn Jan 22, 2018
36b55fc
Address feedback
hishamco Jan 23, 2018
1f00f0a
Use Resources.resx
hishamco Jan 23, 2018
333092a
Add unit tests
hishamco Jan 23, 2018
017bb4d
Fix tests
hishamco Jan 23, 2018
db4cc14
Add functional test
hishamco Jan 23, 2018
e030d85
Update jquery
jbagga Jan 23, 2018
fb922f6
Fix tests broken by changes to config
ryanbrandenburg Jan 23, 2018
aa03958
Branching for 2.1.0-preview1
pranavkm Jan 23, 2018
7aa9149
Branching for 2.1.0-preview1
pranavkm Jan 23, 2018
a633e4d
Branching for 2.1.0-preview1
pranavkm Jan 23, 2018
284ed6e
Merge branch 'release/2.1' into dev
pranavkm Jan 23, 2018
3d647c5
Merge branch 'release/2.1' into dev
pranavkm Jan 23, 2018
402146c
Merge branch 'release/2.1' into dev
pranavkm Jan 23, 2018
f886845
Update jQuery
jbagga Jan 24, 2018
8f955d2
Merge pull request #1588 from aspnet/release/2.1
jbagga Jan 24, 2018
79b4944
Fix typo in DownloadPersonalData
HaoK Jan 24, 2018
ec2ee22
Fix small typo in method docs (#1557)
jkulubya Jan 24, 2018
855f753
Merge remote-tracking branch 'bch/dev' into bch-merge
HaoK Jan 24, 2018
dd03838
Updating version to preview2
pranavkm Jan 24, 2018
a2b8916
Updating version to preview2
pranavkm Jan 24, 2018
e0d7835
Revert "Update jquery"
jbagga Jan 25, 2018
d195866
Revert "Update jquery"
jbagga Jan 25, 2018
561f9ef
Revert "Update jquery" (#1593)
jbagga Jan 25, 2018
284dded
Preview2
ryanbrandenburg Jan 24, 2018
5f83820
Fix IUserRoleStore docs (#1594)
robertmiles3 Jan 25, 2018
ae12755
2fa UI improvements
HaoK Jan 25, 2018
1c6b7e9
Exclude content files from package
pranavkm Jan 26, 2018
aa03ae6
Merge pull request #1600 from aspnet/release/2.1
pranavkm Jan 26, 2018
185482c
[Fixes #1572] Improve the extensibility of the default identity UI
javiercn Jan 21, 2018
d05ddf9
Merge branch 'release/2.1' into origin-dev
javiercn Jan 27, 2018
d69f531
Update dependencies
javiercn Jan 27, 2018
47060f5
Fix build
javiercn Jan 27, 2018
289ea01
Fix precompilation
javiercn Jan 27, 2018
aa50931
Make Razor.Sdk a build time dependency
pranavkm Jan 30, 2018
f2676ba
Add support for REQUEST_METHOD server variable (#294)
mikaelm12 Jan 31, 2018
b85d69c
Merge release/2.1 - Add support for REQUEST_METHOD server variable
mikaelm12 Jan 31, 2018
aa92069
Remove Razor.Design reference
pranavkm Jan 31, 2018
8978907
Merge remote-tracking branch 'origin/release/2.1' into dev
pranavkm Jan 31, 2018
237ae41
Update dependencies.props to 2.1.0-preview-28193, build tools to 2.1.…
Jan 31, 2018
5c8d419
Update dependencies.props to 2.1.0-preview-28193, build tools to 2.1.…
Jan 31, 2018
1ab0584
Update dependencies.props to 2.1.0-preview-28193, build tools to 2.1.…
Jan 31, 2018
9b0f9d8
Update dependencies.props
aspnetci Feb 1, 2018
bc0a3dc
Update dependencies.props
aspnetci Feb 1, 2018
c856272
React to Razor Sdk rename
pranavkm Feb 2, 2018
5c3fc37
Update dependencies.props
aspnetci Feb 3, 2018
1653b63
Update dependencies.props
aspnetci Feb 3, 2018
3fa96d5
Update dependencies.props
aspnetci Feb 3, 2018
5005d6c
Merge pull request #429 from hishamco/readme
Eilon Feb 5, 2018
37b8abf
Refresh user signin after updating their profile (#1615)
jbagga Feb 5, 2018
c6a82ad
TFA cookies now validate security stamp (#1351)
HaoK Feb 6, 2018
629ffb7
Merge pull request #369 from hishamco/useRequestLocalization
mkArtakMSFT Feb 7, 2018
ac3bea1
Add functional tests for Identity UI
javiercn Jan 29, 2018
840756b
Update dependencies.props
aspnetci Feb 9, 2018
2ce152b
Update dependencies.props
aspnetci Feb 9, 2018
1031907
Adding RedirectToWwwRule and extension (#297)
clockworkmice Feb 9, 2018
5a3f9d9
Update dependencies.props
aspnetci Feb 11, 2018
bdbb584
Update dependencies.props
aspnetci Feb 11, 2018
79460b1
Update README.md
Jan 30, 2018
2d405b7
Use Razor Sdk from CLI
pranavkm Feb 15, 2018
ade4478
Use ExperimentalPackageVersion
ryanbrandenburg Feb 15, 2018
ce7d3c7
Use ExperimentalPackageVersion
ryanbrandenburg Feb 15, 2018
d7957ed
No more ExperimentalProjectVersionPrefix
ryanbrandenburg Feb 15, 2018
30f7c7c
BuildNumber on ExperimentalVersionSuffix
ryanbrandenburg Feb 16, 2018
08d0802
BuildNumber on ExperimentalVersionSuffix
ryanbrandenburg Feb 16, 2018
3916758
Duplicate logic for Experimental
ryanbrandenburg Feb 16, 2018
997f3f5
Duplicate logic for Experimental
ryanbrandenburg Feb 16, 2018
c4ce083
Update dependencies.props
aspnetci Feb 18, 2018
5c105e6
Update dependencies.props
aspnetci Feb 18, 2018
da09edc
Update dependencies.props
aspnetci Feb 18, 2018
d1aa7d5
Add an end to end test for login in with a social provider.
javiercn Feb 17, 2018
2511862
[Fixes #1638] Send confirmation email doesn't generate the callback U…
javiercn Feb 18, 2018
3e30d52
[Fixes #1639] Reset password doesn't work
javiercn Feb 18, 2018
5572955
Cleanup Identity functional tests
javiercn Feb 18, 2018
a174d5a
Use FeatureBranchVersionSuffix when generating VersionSuffix
pranavkm Feb 22, 2018
e0885a5
Use FeatureBranchVersionSuffix when generating VersionSuffix
pranavkm Feb 22, 2018
83bb802
Use FeatureBranchVersionSuffix when generating VersionSuffix
pranavkm Feb 22, 2018
298a1e2
Add AllowAnonymous for some Identity razor pages (#1644)
jbagga Feb 23, 2018
0ee3a5d
React to Razor Sdk changes
pranavkm Feb 23, 2018
996f054
Update dependencies.props
aspnetci Feb 26, 2018
db11892
Update dependencies.props
aspnetci Feb 26, 2018
8fee6bf
Update dependencies.props
aspnetci Feb 26, 2018
e3d5fb8
Add link to Identity.Firebase (#1656)
aguacongas Mar 2, 2018
7803ed6
Merge branch 'release/2.1' into dev
Mar 2, 2018
bbad5d6
Merge branch 'release/2.1' into dev
Mar 2, 2018
7c2fec1
Merge branch 'release/2.1' into dev
Mar 2, 2018
b4cf3ed
[Fixes #1628] Avoid stomping on an existing FileProvider
javiercn Feb 14, 2018
7a9eb9a
Use dotnet-core feed in repos
pranavkm Mar 6, 2018
36a6d85
Prepend FeatureBranchVersionPrefix if FeatureBranchVersionSuffix is s…
pranavkm Mar 6, 2018
d504edd
Use dotnet-core feed in repos
pranavkm Mar 6, 2018
884a1b7
Prepend FeatureBranchVersionPrefix if FeatureBranchVersionSuffix is s…
pranavkm Mar 6, 2018
cd2fb23
Use dotnet-core feed in repos
pranavkm Mar 6, 2018
5eacb5e
Prepend FeatureBranchVersionPrefix if FeatureBranchVersionSuffix is s…
pranavkm Mar 6, 2018
47d610b
Skip Flaky tests
ryanbrandenburg Mar 6, 2018
9ecbefc
ProtectPersonalData + extensiblity support (#1562)
HaoK Mar 8, 2018
daa40ce
Update dependencies.props
aspnetci Mar 8, 2018
c6e9b15
Update dependencies.props
aspnetci Mar 8, 2018
3382a59
React to namespace
HaoK Mar 9, 2018
47c1e2c
React to CoreFx Stream changes
Tratcher Mar 9, 2018
0ef8320
Remove unused used that fail to compile
pranavkm Mar 9, 2018
8b58a9a
Scheme and Host value validation
Tratcher Jan 12, 2018
efe0c6b
Split Auth into AddIdentityCookies (#1442)
HaoK Mar 13, 2018
329eed9
Add Test to diagnose CI issues
javiercn Mar 15, 2018
2b80c90
Add host filtering middleware
Tratcher Feb 5, 2018
641dfe3
Use RefreshSignInAsync (#1655)
jbagga Mar 16, 2018
3919d18
React to Razor Sdk changes
pranavkm Mar 16, 2018
0e09114
Branching for 2.1.0-preview2
pranavkm Mar 16, 2018
fcc91c0
Branching for 2.1.0-preview2
pranavkm Mar 16, 2018
7c1ffd1
Branching for 2.1.0-preview2
pranavkm Mar 16, 2018
2ef713c
Merge remote-tracking branch 'origin/release/2.1' into dev
pranavkm Mar 16, 2018
56f045b
Update version prefix to preview3
pranavkm Mar 16, 2018
425c720
Merge remote-tracking branch 'origin/release/2.1' into dev
pranavkm Mar 16, 2018
a5f7024
Update version prefix to preview3
pranavkm Mar 16, 2018
48b394d
Merge remote-tracking branch 'origin/release/2.1' into dev
pranavkm Mar 16, 2018
092c72f
Update version prefix to preview3
pranavkm Mar 16, 2018
b54111e
Update KoreBuild channel
pranavkm Mar 16, 2018
2793186
Merge branch 'release/2.1' into dev
pranavkm Mar 16, 2018
ecd9ff6
Update KoreBuild channel
pranavkm Mar 16, 2018
87a956e
Merge branch 'release/2.1' into dev
pranavkm Mar 16, 2018
018cd00
Update KoreBuild channel
pranavkm Mar 16, 2018
15e7b9c
Merge branch 'release/2.1' into dev
pranavkm Mar 16, 2018
4f5b3be
Remove Microsoft.EntityFrameworkCore.Tools.DotNet
bricelam Mar 19, 2018
b37d89a
Merge branch 'release/2.1' into dev
bricelam Mar 19, 2018
9fda68e
Update jQuery (#1692)
jbagga Mar 19, 2018
f1222d7
Merge pull request #1695 from aspnet/release/2.1
jbagga Mar 19, 2018
910da89
Use partial tag helper (#1696)
jbagga Mar 20, 2018
e09c72c
Merge pull request #1697 from aspnet/release/2.1
jbagga Mar 20, 2018
56666e3
Add AddDefaultIdentity
HaoK Mar 20, 2018
167a108
Add AddDefaultIdentity (#1698)
HaoK Mar 20, 2018
a5ffd9b
Set 2.0 baselines
ryanbrandenburg Mar 14, 2018
e233e60
Add logging for functional tests
Mar 15, 2018
a48b32f
Merge branch 'release/2.1' into dev
Mar 20, 2018
f1d965e
Set 2.0 baselines
ryanbrandenburg Mar 14, 2018
45a0b24
Updating baselines
ryanbrandenburg Mar 21, 2018
aa49e69
React to application part changes
pranavkm Mar 21, 2018
5ee278a
Merge pull request #1703 from aspnet/release/2.1
pranavkm Mar 21, 2018
1fd33f6
Skip flaky tests
ryanbrandenburg Mar 13, 2018
f1abe24
React to Mvc changes
pranavkm Mar 22, 2018
3f1732c
Merge pull request #1707 from aspnet/release/2.1
pranavkm Mar 23, 2018
a226e98
Merge remote-tracking branch 'origin/release/2.1' into rybrande/DevMerge
ryanbrandenburg Mar 23, 2018
2f92fc1
Merge pull request #316 from aspnet/rybrande/DevMerge
ryanbrandenburg Mar 23, 2018
2a7bf18
Update dependencies.props
aspnetci Mar 25, 2018
c39aa98
Update dependencies.props
aspnetci Mar 25, 2018
c2eb3ee
Update dependencies.props
aspnetci Mar 25, 2018
3f990bf
Add pointer to the old stuff.
blowdart Mar 26, 2018
6a20718
Update dependencies.props
Mar 28, 2018
e53e3bc
Update dependencies.props
Mar 28, 2018
7d89ed6
Update dependencies.props
Mar 28, 2018
e0e6952
Update new security stamp logic (#1714)
HaoK Mar 28, 2018
c7711c2
Reenable APICheck (#1715)
HaoK Mar 28, 2018
34ae7ea
Merge remote-tracking branch 'origin/release/2.1' into dev
HaoK Mar 28, 2018
3c9f0ec
Update README.md
ajcvickers Mar 28, 2018
583e505
Update README.md
aguacongas Mar 9, 2018
971f727
[Fixes #1690] AddDefaultUI() throws when using IdentityUser<T>
kichalla Mar 27, 2018
394e474
Merge branch 'release/2.1' into dev
kichalla Mar 30, 2018
1e7ca96
[Fixes #1618] Consider returning a 404 in the DownloadPersonalData.OnGet
kichalla Mar 29, 2018
93beb3a
Merge branch 'release/2.1' into dev
kichalla Mar 30, 2018
0a95aeb
Reacting to templating repo's script changes
kichalla Mar 30, 2018
47e6c9c
Merge branch 'release/2.1' into dev
kichalla Mar 30, 2018
4105ee6
[Fixes #1643] Add third party notice to identity UI package
kichalla Mar 30, 2018
3b27596
Merge branch 'release/2.1' into dev
kichalla Mar 30, 2018
b22c88b
Fix CDN urls to match the fallback source folders' versions
kichalla Apr 2, 2018
90de446
Merge branch 'release/2.1' into dev
kichalla Apr 2, 2018
034e2ad
React to future Razor Sdk package breaking changes
pranavkm Apr 3, 2018
ea4aaa1
Merge remote-tracking branch 'origin/release/2.1' into dev
pranavkm Apr 3, 2018
77095e9
Update dependencies.props
aspnetci Apr 3, 2018
3fc7fec
Update dependencies.props
aspnetci Apr 3, 2018
8852171
Update dependencies.props
aspnetci Apr 3, 2018
0007385
Ensure experimental package version is 0.4.0-preview3-final, not 0.4.…
Apr 6, 2018
fc3ab08
Ensure experimental package version is 0.4.0-preview3-final, not 0.4.…
Apr 6, 2018
956e76f
Add Alexandre's MongoDb provider
blowdart Apr 9, 2018
768cad8
Reload HostFilter options on change #317
Tratcher Apr 11, 2018
553ce64
Fix dependency typo
Tratcher Apr 12, 2018
5a2eb3b
Include social logins and authenticator key as part of personal downl…
HaoK Apr 12, 2018
49aafe8
Update usage of TestSink
Apr 12, 2018
a273e34
Fix error message (#1752)
HaoK Apr 13, 2018
f51af82
[Fixes #1742, #1722, #1706, #1725, #1688] Fixes multiple issues
javiercn Apr 11, 2018
e5d9efb
Prepare for RazorAssemblyAttribute -> RazorTargetAssemblyAttribute re…
pranavkm Apr 13, 2018
ae9aa9e
Add AllowAnonymous for resetting password navigation flow (#1744)
jbagga Apr 13, 2018
0c31fcd
Update dependencies.props
aspnetci Apr 15, 2018
985c8a8
Update dependencies.props
aspnetci Apr 15, 2018
9f0d28f
Update dependencies.props
aspnetci Apr 15, 2018
0a876ce
Make https redirect no-op if no port is available #318
Tratcher Apr 13, 2018
34467c2
Merge remote-tracking branch 'origin/release/2.1' into rybrande/Merge…
ryanbrandenburg Apr 16, 2018
cd3e968
Merge pull request #322 from aspnet/rybrande/MergeRelease21IntoDev
ryanbrandenburg Apr 16, 2018
7cec5cc
Merge remote-tracking branch 'origin/release/2.1' into rybrande/Merge…
ryanbrandenburg Apr 16, 2018
f961936
Branching for 2.1.0-rc1
ryanbrandenburg Apr 16, 2018
9b2a7d3
Branching for 2.1.0-rc1
ryanbrandenburg Apr 16, 2018
979c8f0
Branching for 2.1.0-rc1
ryanbrandenburg Apr 16, 2018
f873c15
Fix build break
pranavkm Apr 17, 2018
eb5499a
Set NETStandardImplicitPackageVersion via dependencies.props
Apr 19, 2018
8c79001
Set NETStandardImplicitPackageVersion via dependencies.props
Apr 19, 2018
dcff2c9
Set NETStandardImplicitPackageVersion via dependencies.props
Apr 19, 2018
030d523
Update dependencies.props
aspnetci Apr 20, 2018
390e1e3
Update dependencies.props
aspnetci Apr 20, 2018
47d7bc9
Update dependencies.props
aspnetci Apr 20, 2018
f0f42cf
Bump version to 2.1.0-rtm
Apr 30, 2018
5cf691e
Bump version to 2.1.0-rtm
Apr 30, 2018
a2b093b
Bump version to 2.1.0-rtm
Apr 30, 2018
a89dc30
AllowAnonymous for external login providers and confirm email (#1769)
jbagga May 1, 2018
82f6cd2
Update dependencies.props
aspnetci May 4, 2018
534e20b
Update dependencies.props
aspnetci May 4, 2018
8815ba1
Update dependencies.props
aspnetci May 4, 2018
e306b86
Fix namespace for AddDefaultIdentity (#1781)
HaoK May 4, 2018
5403ec4
Fixed sha-integrity content of script tags in IdentityUI's cshtml files
kichalla May 16, 2018
2629cee
CheckPassword only reset lockout when TFA disabled
HaoK Apr 23, 2018
901efb0
Update dependencies.props
aspnetci May 29, 2018
c408fb3
Update dependencies.props
aspnetci May 29, 2018
c69da9d
Update dependencies.props
aspnetci May 29, 2018
d18de6b
Bumping version from 2.1.0 to 2.1.1
May 30, 2018
999ed53
Bumping version from 2.1.0 to 2.1.1
Jun 5, 2018
02beb0a
Bumping version from 2.1.0 to 2.1.1
Jun 5, 2018
8c7e735
Update dependencies.props
aspnetci Jun 12, 2018
64a8825
Update dependencies.props
aspnetci Jun 12, 2018
ebe067f
Update dependencies.props
aspnetci Jun 12, 2018
788e324
Bumping version from 2.1.1 to 2.1.2
Jun 12, 2018
2627ea5
Merge branch 'release/2.1' into release/2.1.2
Jun 12, 2018
61ced27
Set 2.1 baselines
ryanbrandenburg Jun 14, 2018
4295027
Set 2.1 baselines
ryanbrandenburg Jun 14, 2018
d2dcd9c
Set 2.1 baselines
ryanbrandenburg Jun 14, 2018
d6a2916
Bumping version from 2.1.1 to 2.1.2
Jun 27, 2018
7fbb558
Bumping version from 2.1.2 to 2.1.3
Jun 27, 2018
bd43a69
Bumping version from 2.1.1 to 2.1.2
Jun 27, 2018
3eae930
Merge 2.1.2 into release/2.1
Jul 10, 2018
0ab8e15
[Fixes #1866] Fix ActivePage declarations
tstivers1990 Jul 10, 2018
a8187c1
Reverting version from 2.1.2 back to 2.1.1
Jul 11, 2018
51e5761
Reverting version from 2.1.2 back to 2.1.1
Jul 11, 2018
5926bc2
Updating dependencies to 2.1.2 and adding a section for pinned variab…
Jul 12, 2018
d6cb9c2
Updating dependencies to 2.1.2 and adding a section for pinned variab…
Jul 12, 2018
23c0d5e
Updating dependencies to 2.1.2 and adding a section for pinned variab…
Jul 12, 2018
1de636c
Pin version variables to the ASP.NET Core 2.1.2 baseline
Jul 12, 2018
2634637
Pin version variables to the ASP.NET Core 2.1.2 baseline
Jul 12, 2018
0bcac31
Pin version variables to the ASP.NET Core 2.1.2 baseline
Jul 12, 2018
646e65c
Bumping version from 2.1.3 to 2.1.4
Sep 28, 2018
042b6ec
Fix version suffix in version.props
natemcmaster Oct 4, 2018
2327d6a
Update branding to 2.1.6-servicing (#1994)
natemcmaster Oct 5, 2018
5c174a3
Fix login.cshtml
HaoK Oct 10, 2018
ee8e882
Merge pull request #2007 from aspnet/haok/login
HaoK Oct 12, 2018
ba67b04
Ensure IsTestProject=false in Microsoft.AspNetCore.Identity.Specifica…
Oct 26, 2018
fa3cfd0
Remove IdentityService (#2028)
natemcmaster Oct 26, 2018
2f2cec4
Reorganize source code in preparation to move into aspnet/AspNetCore
Nov 30, 2018
0843320
Merge source code from aspnet/BasicMiddleware
Nov 30, 2018
04fc8ae
Update targets and projects to build BasicMiddleware projects
Nov 30, 2018
d93796f
Reorganize source code in preparation to move into aspnet/AspNetCore
Nov 30, 2018
7e0f561
Merge source code from aspnet/Localization
Nov 30, 2018
7078102
Update targets and projects to build Localization projects
Nov 30, 2018
c645961
Reorganize source code in preparation to move into aspnet/AspNetCore
Dec 3, 2018
a6b5bb1
Merge source code from aspnet/Identity
Dec 3, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 0 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
[submodule "modules/BasicMiddleware"]
path = modules/BasicMiddleware
url = https://github.com/aspnet/BasicMiddleware.git
branch = release/2.1
[submodule "modules/EntityFrameworkCore"]
path = modules/EntityFrameworkCore
url = https://github.com/aspnet/EntityFrameworkCore.git
branch = release/2.1
[submodule "modules/Identity"]
path = modules/Identity
url = https://github.com/aspnet/Identity.git
branch = release/2.1
[submodule "modules/Localization"]
path = modules/Localization
url = https://github.com/aspnet/Localization.git
branch = release/2.1
[submodule "modules/Scaffolding"]
path = modules/Scaffolding
url = https://github.com/aspnet/Scaffolding.git
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance'))">true</IsBenchmarkProject>
<IsTestProject Condition="$(MSBuildProjectName.EndsWith('Tests')) OR $(MSBuildProjectName.EndsWith('.Test'))">true</IsTestProject>
<IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
<IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('samples'))">true</IsSampleProject>
<IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>

<IncludeSource>false</IncludeSource>
<IncludeSymbols>true</IncludeSymbols>
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<IsPackable Condition="'$(IsPackable)' == '' AND ( '$(IsTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' ) ">false</IsPackable>
</PropertyGroup>

<Import Project="eng\Baseline.props" />
<Import Project="eng\Baseline.Designer.props" />

<PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' ">
<!-- Always include framework metapackages in patch updates. -->
Expand Down
3 changes: 0 additions & 3 deletions build/artifacts.props
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<PackageArtifact Include="Microsoft.AspNetCore.Authorization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" AllMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" AllMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Buffering" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.CookiePolicy" AllMetapackage="true" AppMetapackage="true" Category="ship" />
Expand Down Expand Up @@ -179,8 +178,6 @@
<PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" />
<PackageArtifact Include="Microsoft.Extensions.Identity.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Identity.Stores" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Localization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.Net.Http.Headers" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" />
<PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="ship" />
Expand Down
4 changes: 1 addition & 3 deletions build/buildorder.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
<RepositoryBuildOrder Include="HttpSysServer" Order="8" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
<RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
<RepositoryBuildOrder Include="Antiforgery" Order="9" RootPath="$(RepositoryRoot)src\Antiforgery\" />
<RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
<RepositoryBuildOrder Include="CORS" Order="11" RootPath="$(RepositoryRoot)src\CORS\" />
Expand All @@ -19,12 +18,11 @@
<RepositoryBuildOrder Include="ResponseCaching" Order="11" RootPath="$(RepositoryRoot)src\ResponseCaching\" />
<RepositoryBuildOrder Include="Session" Order="11" RootPath="$(RepositoryRoot)src\Session\" />
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
<RepositoryBuildOrder Include="Localization" Order="12" />
<RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
<RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />
<RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />
<RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
<RepositoryBuildOrder Include="Identity" Order="15" />
<RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\" />
<RepositoryBuildOrder Include="JavaScriptServices" Order="15" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
Expand Down
2 changes: 2 additions & 0 deletions build/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
<MicrosoftExtensionsHostingAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsHostingPackageVersion>2.1.1</MicrosoftExtensionsHostingPackageVersion>
<MicrosoftExtensionsHttpPackageVersion>2.1.1</MicrosoftExtensionsHttpPackageVersion>
<MicrosoftExtensionsLocalizationAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
<MicrosoftExtensionsLocalizationPackageVersion>2.1.1</MicrosoftExtensionsLocalizationPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>2.1.1</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
<MicrosoftExtensionsLoggingConfigurationPackageVersion>2.1.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
Expand Down
2 changes: 2 additions & 0 deletions build/external-dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
<ExtensionsDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
<ExtensionsDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
<ExtensionsDependency Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
<ExtensionsDependency Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
<ExtensionsDependency Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
<ExtensionsDependency Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
<ExtensionsDependency Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
<ExtensionsDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" AllMetapackage="true" AppMetapackage="true" />
Expand Down
4 changes: 1 addition & 3 deletions build/submodules.props
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,12 @@
<ShippedRepository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
<ShippedRepository Include="Antiforgery" RootPath="$(RepositoryRoot)src\Antiforgery\" />
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
<ShippedRepository Include="BasicMiddleware" />
<ShippedRepository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" />
<ShippedRepository Include="EntityFrameworkCore" />
<ShippedRepository Include="HttpSysServer" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
<ShippedRepository Include="Identity" />
<ShippedRepository Include="Identity" RootPath="$(RepositoryRoot)src\Identity\" />
<ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
<ShippedRepository Include="JsonPatch" />
<ShippedRepository Include="Localization" />
<ShippedRepository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
<ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
Expand Down
72 changes: 72 additions & 0 deletions eng/Baseline.props → eng/Baseline.Designer.props
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,16 @@
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.0, )" />
<BaselinePackageReference Include="System.Reflection.Metadata" Version="[1.6.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.HostFiltering-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HostFiltering' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HostFiltering' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Hosting.Abstractions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting.Abstractions' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
Expand Down Expand Up @@ -244,6 +254,26 @@
<BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.HttpOverrides-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpOverrides' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpOverrides' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.HttpsPolicy-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpsPolicy' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpsPolicy' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.JsonPatch-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
Expand All @@ -252,6 +282,24 @@
<BaselinePackageReference Include="Microsoft.CSharp" Version="[4.5.0, )" />
<BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Localization.Routing-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization.Routing' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization.Routing' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Localization" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Localization-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.MiddlewareAnalysis-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.MiddlewareAnalysis' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
Expand All @@ -268,6 +316,30 @@
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.ResponseCompression-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' AND '$(TargetFramework)' == 'net461' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Rewrite-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Rewrite' ">
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Rewrite' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Server.Kestrel.Core-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Core' ">
<BaselinePackageVersion>2.1.3</BaselinePackageVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<Package Id="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.HostFiltering" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.1.1" />
Expand All @@ -27,9 +28,15 @@
<Package Id="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Localization.Routing" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Localization" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Owin" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.1.3" />
Expand Down
3 changes: 3 additions & 0 deletions eng/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@
<LatestPackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(MicrosoftExtensionsDiagnosticAdapterPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.Process.Sources" Version="$(MicrosoftExtensionsProcessSourcesPackageVersion)" />
<LatestPackageReference Include="Microsoft.Extensions.RazorViews.Sources" Version="$(MicrosoftExtensionsRazorViewsSourcesPackageVersion)" />
Expand Down
Loading