Skip to content

Merge release/2.2 to master #4424

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 2,239 commits into from
Dec 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2239 commits
Select commit Hold shift + click to select a range
79b372c
Update dependencies.props
aspnetci Jul 22, 2018
31eaaac
Merge branch 'release/2.1' into release/2.2
Jul 24, 2018
1db4582
Update CONTRIBUTING.md
Eilon Jul 24, 2018
e7d4c76
Update CONTRIBUTING.md
Eilon Jul 24, 2018
5f649e1
Update CONTRIBUTING.md
Eilon Jul 24, 2018
d595e54
Merge branch 'release/2.1' into release/2.2
Jul 24, 2018
e30ea68
Merge branch 'release/2.1' into release/2.2
Jul 24, 2018
ff0e925
Merge branch 'release/2.2'
Jul 24, 2018
e12c118
Merge branch release/2.2
Jul 24, 2018
5b1fee6
Merge branch release/2.2
Jul 24, 2018
a046f02
Upgrade deps
Jul 27, 2018
2b74aed
Upgrade build tools
Jul 27, 2018
bed2c99
Merge branch 'release/2.2'
Jul 27, 2018
d2b2535
Update dependencies.props
aspnetci Jul 29, 2018
cfe58b6
Update dependencies.props
aspnetci Jul 29, 2018
402a19a
Update dependencies.props
aspnetci Jul 29, 2018
b8c4668
Update dependencies.props
aspnetci Jul 29, 2018
0777423
Update dependencies.props
aspnetci Jul 29, 2018
3ab46aa
Update dependencies.props
aspnetci Jul 29, 2018
4b2dc59
[Fixes #1835] Move the default Identity UI to use Bootstrap 4
javiercn Jul 18, 2018
16a933a
Update static content
javiercn Aug 4, 2018
878a57f
Update dependencies.props
aspnetci Aug 5, 2018
520d072
Update dependencies.props
aspnetci Aug 5, 2018
e996ca9
Update dependencies.props
aspnetci Aug 5, 2018
d8a90ce
Update dependencies.props
aspnetci Aug 5, 2018
3624da4
fixing typo #1907
GordonBeeming Aug 5, 2018
8197412
Update dependencies.props
aspnetci Aug 5, 2018
4401c58
Update dependencies.props
aspnetci Aug 5, 2018
30bf356
Update dependencies.props
aspnetci Aug 6, 2018
b3f356c
Update dependencies.props
aspnetci Aug 6, 2018
e522b3e
Update dependencies.props
aspnetci Aug 6, 2018
9500726
Update dependencies.props
aspnetci Aug 12, 2018
3ae6a1d
Update dependencies.props
aspnetci Aug 12, 2018
4c21251
Update dependencies.props
aspnetci Aug 12, 2018
1203bcf
Update dependencies.props
aspnetci Aug 12, 2018
4f71b90
Update dependencies.props
aspnetci Aug 12, 2018
f3065fa
Update dependencies.props
aspnetci Aug 12, 2018
6b257f0
Merge pull request #1908 from Gordon-Beeming/fixes/issue1907
HaoK Aug 16, 2018
b005ef7
Bumping version from 2.2.0 to 3.0.0
Jun 28, 2018
32a08fe
[automated] Change default branch to master
Jul 2, 2018
87cfd54
Fixed documentation typo (#1862)
wilsonrivera Jul 6, 2018
eeeef16
Update CONTRIBUTING.md
Eilon Jul 24, 2018
fec9467
Fix SignInManager to return correct external provider display name
thomaslevesque Jul 29, 2018
373a9c5
Update default UI and samples to use provider display name
thomaslevesque Jul 30, 2018
5e84c11
Add functional tests for external provider display name
thomaslevesque Aug 1, 2018
39298e8
Merge branch 'release/2.2' into master
HaoK Aug 16, 2018
797ea9d
Fix sln file
HaoK Aug 16, 2018
39611d3
Fix sln file
HaoK Aug 16, 2018
d7b4f11
Merge pull request #1921 from aspnet/haok/mg-rel22
HaoK Aug 16, 2018
1d7a410
Merge pull request #1869 from tincann/patch-1
HaoK Aug 17, 2018
d040dab
Allow QR AuthenticatorIssuer to be configurable
HaoK Aug 17, 2018
4acb2f3
Merge pull request #1925 from aspnet/haok/qr
HaoK Aug 17, 2018
0682c13
Merge pull request #1927 from dotnet-maestro-bot/merge/release/2.2-to…
HaoK Aug 17, 2018
ee0a25e
Revert "Bumping version from 2.2.0 to 3.0.0"
HaoK Aug 17, 2018
1b8b581
Revert "[automated] Change default branch to master"
HaoK Aug 17, 2018
309911a
Merge branch 'release/2.2'
HaoK Aug 17, 2018
cfa1bb3
Merge pull request #1928 from aspnet/haok/mg22
HaoK Aug 17, 2018
0a0cf80
Update dependencies.props
aspnetci Aug 19, 2018
a255edc
Update dependencies.props
aspnetci Aug 19, 2018
fa573e1
Update dependencies.props
aspnetci Aug 19, 2018
7f14344
Update package branding for 2.2.0-preview2
aspnetci Aug 21, 2018
51dac74
Update package branding for 2.2.0-preview2
aspnetci Aug 21, 2018
496d61e
Update package branding for 2.2.0-preview2
aspnetci Aug 21, 2018
ac744d8
Support Bootstrap 3 and Bootstrap 4 on idenity UI
javiercn Aug 17, 2018
f2e4a63
Fix msbuild
javiercn Aug 23, 2018
b3a6bda
Sync Identity UI default layout with the templates layout
javiercn Aug 23, 2018
e03129e
Merge branch 'release/2.2'
javiercn Aug 25, 2018
54cba4c
Update dependencies.props
aspnetci Aug 26, 2018
543e05d
Update dependencies.props
aspnetci Aug 26, 2018
1c11511
Update dependencies.props
aspnetci Aug 26, 2018
64af022
Disable parallelization (#1944)
HaoK Aug 27, 2018
ab72b82
Merge pull request #1945 from dotnet-maestro-bot/merge/release/2.2-to…
HaoK Aug 27, 2018
2246c6b
Fixed comment and log message for ForwardedHeadersMiddleware (#357)
alfredmyers Aug 29, 2018
e38a307
Allow cookie validation when stores don't support security stamp (#1941)
HaoK Aug 29, 2018
fcc0210
Merge pull request #1947 from dotnet-maestro-bot/merge/release/2.2-to…
HaoK Aug 29, 2018
de3e6e0
Remove references to MvcPrecompilation package
pranavkm Aug 30, 2018
bb1cd5e
Stop building dependent projects
javiercn Aug 30, 2018
f8181ef
Merge branch 'release/2.2'
javiercn Aug 30, 2018
2aea329
Update dependencies.props
aspnetci Sep 2, 2018
4fb6f01
Update dependencies.props
aspnetci Sep 2, 2018
8304283
Update dependencies.props
aspnetci Sep 2, 2018
216f9ff
Update dependencies.props
aspnetci Sep 2, 2018
d6a783a
Update dependencies.props
aspnetci Sep 2, 2018
aed467f
Update dependencies.props
aspnetci Sep 2, 2018
b0d334a
Update branding to 2.2.0-preview3
aspnetci Sep 5, 2018
fae6cb0
Update branding to 2.2.0-preview3
aspnetci Sep 5, 2018
9309edf
Update branding to 2.2.0-preview3
aspnetci Sep 5, 2018
a1fc509
Update dependencies.props
aspnetci Sep 5, 2018
a7abf7e
Update dependencies.props
aspnetci Sep 5, 2018
91042d3
Update dependencies.props
aspnetci Sep 5, 2018
d36dcca
Handle IPv4ToIPv6 Mapped Addresses when checking known proxies/networ…
SebastianC Sep 7, 2018
b179245
Update dependencies.props
aspnetci Sep 9, 2018
15d5545
Update dependencies.props
aspnetci Sep 9, 2018
01f8f36
Update dependencies.props
aspnetci Sep 9, 2018
1438a1b
Update dependencies.props
aspnetci Sep 9, 2018
c8ca5c5
Update dependencies.props
aspnetci Sep 9, 2018
61fdcfe
Update dependencies.props
aspnetci Sep 9, 2018
b945286
Update IdentityServiceCollectionExtensions.cs docs (#1962)
Sep 12, 2018
f171aa4
Update dependencies.props
aspnetci Sep 16, 2018
6218c8c
Update dependencies.props
aspnetci Sep 16, 2018
415a6cb
Update dependencies.props
aspnetci Sep 16, 2018
ed28df1
Update dependencies.props
aspnetci Sep 16, 2018
1e6af9e
Update dependencies.props
aspnetci Sep 16, 2018
fc2dfd9
Update dependencies.props
aspnetci Sep 16, 2018
7f348c4
Merge branch 'release/2.2'
Tratcher Sep 17, 2018
4a4dde1
replacing string interpolation with proper logging syntax (#363)
daniel-white Sep 17, 2018
2a731ba
Merge branch 'release/2.2'
Tratcher Sep 17, 2018
6699804
Do not compress response if it is already compressed (#305) (#365)
melnikov77 Sep 20, 2018
db7c2bf
Merge pull request #366 from dotnet-maestro-bot/merge/release/2.2-to-…
Tratcher Sep 20, 2018
44c3e5d
Titles in h1 (#1966)
ryanbrandenburg Sep 20, 2018
4e0c9f4
Reference Microsoft.NET.Sdk.Razor in projects with Razor files
pranavkm Sep 20, 2018
5119f96
Update dependencies.props
aspnetci Sep 23, 2018
e0be511
Update dependencies.props
aspnetci Sep 23, 2018
299ca40
Update dependencies.props
aspnetci Sep 23, 2018
0324313
Update dependencies.props
aspnetci Sep 23, 2018
db7b06e
Update dependencies.props
aspnetci Sep 23, 2018
c975c79
Update dependencies.props
aspnetci Sep 23, 2018
9b38518
Merge remote-tracking branch 'origin/release/2.2' into prkrishn/updat…
pranavkm Sep 24, 2018
10d43f6
Merge branch 'release/2.2'
Tratcher Sep 25, 2018
cc61095
Support mime-type wildcards #121 @andrewslavin
andrewslavin Mar 17, 2018
e2b5de3
Update LICENSE.txt
Eilon Sep 27, 2018
d55bd55
Update LICENSE.txt
Eilon Sep 27, 2018
6c2088e
Update LICENSE.txt
Eilon Sep 27, 2018
601bf83
Merge pull request #370 from dotnet-maestro-bot/merge/release/2.2-to-…
Tratcher Sep 27, 2018
594b5fa
Enable MicroBuild code signing
Sep 27, 2018
73062c8
Change spec test packages to depend on xunit.execution.core, not the …
natemcmaster Sep 27, 2018
646e65c
Bumping version from 2.1.3 to 2.1.4
Sep 28, 2018
09a7b3b
Add logging to the response compression middleware #222
Tratcher Sep 28, 2018
0143da6
Merge branch 'release/2.2'
Tratcher Sep 28, 2018
3825c24
Merge branch 'release/2.2'
Sep 28, 2018
b49931e
automated: bulk infrastructure updates. Update bootstrapper scripts a…
Sep 29, 2018
f2652e9
automated: bulk infrastructure updates. Update bootstrapper scripts a…
Sep 29, 2018
42ba4fc
automated: bulk infrastructure updates. Update bootstrapper scripts a…
Sep 29, 2018
cbc40ea
automated: merge branch release/2.2
Sep 29, 2018
b9793cf
automated: merge branch release/2.2
Sep 29, 2018
72bb4f2
automated: merge branch release/2.2
Sep 29, 2018
2a89639
Update dependencies.props
aspnetci Sep 30, 2018
3fd750c
Update dependencies.props
aspnetci Sep 30, 2018
c54525f
Update dependencies.props
aspnetci Sep 30, 2018
4ce1928
Update dependencies.props
aspnetci Sep 30, 2018
9ecc9ab
Update dependencies.props
aspnetci Sep 30, 2018
983c655
Update dependencies.props
aspnetci Sep 30, 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
dd9873b
Merge branch 'release/2.1' into release/2.2
Oct 5, 2018
3a9e62d
Merge branch 'release/2.2'
Oct 5, 2018
6339351
Update dependencies.props
aspnetci Oct 7, 2018
1610c35
Update dependencies.props
aspnetci Oct 7, 2018
3940ada
Update dependencies.props
aspnetci Oct 7, 2018
a125959
Update dependencies.props
aspnetci Oct 7, 2018
5c174a3
Fix login.cshtml
HaoK Oct 10, 2018
51ddcc7
Update dependencies.props
aspnetci Oct 11, 2018
04552f4
Update Jquery.validation.Unobtrusive (#1999)
ryanbrandenburg Oct 11, 2018
f5b5018
[Fixes #1958] Add and generate docs for the default UI
javiercn Oct 11, 2018
c71818e
Merge branch 'master' into merge/release/2.2-to-master
ryanbrandenburg Oct 11, 2018
ee8e882
Merge pull request #2007 from aspnet/haok/login
HaoK Oct 12, 2018
44f0001
Merge 2.1 -> 2.2 (#2009)
HaoK Oct 12, 2018
81928f6
Merge pull request #2005 from dotnet-maestro-bot/merge/release/2.2-to…
ryanbrandenburg Oct 12, 2018
0fa3195
Update package branding for 2.2 RTM
aspnetci Oct 16, 2018
daff2f3
Update package branding for 2.2 RTM
aspnetci Oct 16, 2018
de1579b
Update package branding for 2.2 RTM
aspnetci Oct 16, 2018
a6aa152
Merge branch 'master' into merge/release/2.2-to-master
javiercn Oct 16, 2018
cb61759
Merge pull request #372 from dotnet-maestro-bot/merge/maestro/master-…
muratg Oct 16, 2018
efb66fe
add DocumentDB provider to community provider list
felschr Oct 17, 2018
c21cee9
Specify culture to int.TryParse #356
Tratcher Oct 17, 2018
1e84159
Merge branch 'release/2.2'
Tratcher Oct 17, 2018
2c9e194
Merge branch 'dotnet-maestro-bot-merge/release/2.2-to-master'
javiercn Oct 19, 2018
2d3ad1c
Add application/wasm to the default compression list (#377)
Tratcher Oct 23, 2018
268290a
Merge pull request #378 from dotnet-maestro-bot/merge/release/2.2-to-…
Tratcher Oct 23, 2018
3486b97
Merge pull request #2018 from FelschR/patch-1
blowdart Oct 25, 2018
51de582
[Fixes #2002] UI package has path error (#2024)
javiercn Oct 25, 2018
168be7b
Use the correct logging category inside RegisterModel
huysentruitw Sep 21, 2018
08074b6
Merge pull request #2025 from dotnet-maestro-bot/merge/release/2.2-to…
javiercn Oct 25, 2018
95bc251
Avoid file descriptor exhaustion caused by Razor Pages on functional …
javiercn Oct 26, 2018
2ab58c4
Merge branch 'release/2.2'
javiercn Oct 26, 2018
ba67b04
Ensure IsTestProject=false in Microsoft.AspNetCore.Identity.Specifica…
Oct 26, 2018
fa3cfd0
Remove IdentityService (#2028)
natemcmaster Oct 26, 2018
6c45bfc
Merge 2.1 -> 2.2 (#2030)
HaoK Oct 26, 2018
9379966
Merge pull request #2031 from dotnet-maestro-bot/merge/release/2.2-to…
HaoK Oct 30, 2018
9405d05
Merge branch 'release/2.1' into release/2.2
Oct 30, 2018
4c9c4a5
Merge branch 'release/2.2'
Oct 30, 2018
da9318f
Block enabled 2fa in the UI without cookie consent (#2035)
HaoK Oct 30, 2018
1fde1cc
React to Razor.Design package removal
pranavkm Oct 31, 2018
5e10eb1
Support for ApiAuth using Identity Server
javiercn Oct 29, 2018
405adf3
Merge remote-tracking branch 'origin/release/2.2'
javiercn Nov 1, 2018
f56df64
Merge pull request #2047 from aspnet/javiercn/merge-22-master
javiercn Nov 1, 2018
b56dc07
Ensure ApiAuthorization.IdentityServer doesn't build a 2.2.0 package …
natemcmaster Nov 1, 2018
95205d9
Merge branch 'release/2.2'
Nov 1, 2018
99f352a
javiercn/check-integrity-validation (#2052)
javiercn Nov 2, 2018
7421ba8
Merge release/2.2 -> master
javiercn Nov 2, 2018
01c1f7b
Fix typo (#2066)
blankenbush Nov 14, 2018
073b037
Use 3.0 configuration in RCLs
pranavkm Nov 14, 2018
b8747c8
Adding AddRequestCultureProvider as extension method (#458)
hishamco Nov 15, 2018
68b878f
Upgrade packages and projects to target netcoreapp3.0 (aspnet/Identit…
natemcmaster Nov 17, 2018
60a3d57
Upgrade aspnetcore packages to target netcoreapp3.0 (aspnet/Localizat…
natemcmaster Nov 19, 2018
4046c84
Update Identity Server dependencies to 2.3.0 (#2077)
javiercn Nov 20, 2018
781ca09
Merge remote-tracking branch 'origin/release/2.2' into origin/master
javiercn Nov 20, 2018
8003a55
React to breaking change in aspnet/Mvc
Nov 22, 2018
c283dfb
Update README.md
natemcmaster Nov 27, 2018
70483af
Create Hosting.sln to fix tests
Tratcher Nov 27, 2018
af8d67f
Ensure static analysis gets the right package versions when patching …
Nov 27, 2018
63b26d4
Replace ManualResetEvent with TaskCompletionSource in TestHost tests
Tratcher Nov 28, 2018
ccc4c12
Remove `SetCompatibiltyVersion(...)` call in sample (#2088)
dougbu Nov 30, 2018
054cfac
Add EntityFrameworkCore to the list of submodules patching in 2.2.1 (…
natemcmaster Nov 30, 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
d9a953d
Autobahn test suite fix(#4302)
mikaelm12 Dec 1, 2018
197c556
Update EFCore submodule (#4349)
natemcmaster Dec 1, 2018
b2b1cf2
Updating BuildTools from 2.2.1-build-20181114.3 to 2.2.1-build-201811…
aspnetci Dec 1, 2018
d73e3b2
Merge remote-tracking branch 'origin/release/2.1' into tratcher/testh…
Tratcher Dec 3, 2018
81bc0b1
Fix test asset casing in Hosting funcational tests
Tratcher Dec 3, 2018
8ebca19
Updating submodule(s)
aspnetci Dec 3, 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
f6b4d65
[Diagnostics] Fix Diagnostics middleware errors (#4271)
javiercn Dec 4, 2018
ab8919e
Updating submodule(s)
aspnetci Dec 4, 2018
9f2829a
Updating BuildTools from 2.2.1-build-20181130.1 to 2.2.1-build-201812…
aspnetci Dec 4, 2018
61e9b3e
Merge Identity, Localization and BasicMiddleware
Dec 4, 2018
b875070
Updating submodule(s)
Dec 4, 2018
d8c434f
Reorganize source code in preparation to move into aspnet/AspNetCore
Dec 4, 2018
ec41d9b
Reorganize source code in preparation to move into aspnet/AspNetCore
Dec 4, 2018
44ec52e
Reorganize source code in preparation to move into aspnet/AspNetCore
Dec 4, 2018
b140962
Reorganize source code in preparation to move into aspnet/AspNetCore
Dec 4, 2018
1be2b42
Merge branch 'release/2.1' into release/2.2
Dec 4, 2018
7e823a0
Merge release/2.2 from aspnet/BasicMiddleware
Dec 4, 2018
e261ca5
Merge release/2.2 from aspnet/Localization
Dec 4, 2018
4b3d8e5
Delete msbuild.binlog
natemcmaster Dec 4, 2018
4a717c8
Delete msbuild.binlog
natemcmaster Dec 4, 2018
c5bc96d
Reorganize source code in preparation to move into aspnet/AspNetCore
Dec 4, 2018
9400390
Merge branch 'release/2.1' into release/2.2
Dec 4, 2018
2c376eb
Merge the release/2.2 branch of aspnet/Identity
Dec 4, 2018
11fdf9b
Fix bad merge of .csproj and update Middleware.sln
Dec 4, 2018
cd3f6e6
Add Localization assemblies to sign config
Dec 4, 2018
ab12c70
Suppress false-positives in credential scanning (#4392)
natemcmaster Dec 4, 2018
638d6d0
Merge branch 'release/2.1'
Dec 4, 2018
f6e691f
Move InMemory.FunctionalTests to own TestGroup
halter73 Dec 4, 2018
1733aa0
Updating submodule(s)
aspnetci Dec 5, 2018
be3b66d
Revert "Remove Razor tooling projects"
Dec 5, 2018
62f9655
Merge branch 'release/2.2'
Dec 5, 2018
08e243f
Merge the master branch of aspnet/BasicMiddleware
Dec 5, 2018
82184e9
Merge the master branch of aspnet/Localization
Dec 5, 2018
e9fb6d2
Reorganize source code in preparation to move into aspnet/AspNetCore
Dec 5, 2018
a392d4b
Merge release/2.2
Dec 5, 2018
4c6bbe5
Merge the master branch of aspnet/Identity
Dec 5, 2018
e0bbda0
Update basic middleware projects to netcoreapp3.0
Dec 5, 2018
c95ee2b
Merge branch 'master' into namc/merge-2.2
Dec 5, 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
  •  
  •  
  •  
25 changes: 25 additions & 0 deletions .config/CredScanSuppressions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"tool": "Credential Scanner",
"suppressions": [
{
"placeholder": "password",
"_justification": "This is a fake password used in test code."
},
{
"placeholder": "newpassword",
"_justification": "This is a fake password used in test code."
},
{
"placeholder": "AAABAgMEBQYHCAkKCwwNDg+ukCEMDf0yyQ29NYubggE=",
"_justification": "This is a fake password hash used in test code."
},
{
"placeholder": "1qaz!QAZ",
"_justification": "This is a fake password used in test code."
},
{
"placeholder": "1qaz@WSX",
"_justification": "This is a fake password used in test code."
}
]
}
12 changes: 0 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
[submodule "modules/BasicMiddleware"]
path = modules/BasicMiddleware
url = https://github.com/aspnet/BasicMiddleware.git
branch = master
[submodule "modules/Identity"]
path = modules/Identity
url = https://github.com/aspnet/Identity.git
branch = master
[submodule "modules/Localization"]
path = modules/Localization
url = https://github.com/aspnet/Localization.git
branch = master
[submodule "src/IISIntegration/test/gtest/googletest"]
path = src/IISIntegration/test/gtest/googletest
url = https://github.com/google/googletest
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,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
2 changes: 2 additions & 0 deletions build/CodeSign.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
<FilesToSign Include="Microsoft.Extensions.Hosting.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Hosting.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Http.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Localization.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Localization.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Logging.Abstractions.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Logging.Configuration.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
<FilesToSign Include="Microsoft.Extensions.Logging.Console.dll" Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
Expand Down
2 changes: 0 additions & 2 deletions build/artifacts.props
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@
<PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Identity.Core" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Identity.Stores" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" Category="ship" />
<PackageArtifact Include="Microsoft.Extensions.Localization" Category="ship" />
<PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" />

<!-- Packages for internal use only. -->
Expand Down
4 changes: 1 addition & 3 deletions build/buildorder.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<ItemGroup>
<RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
<RepositoryBuildOrder Include="HttpSysServer" Order="8" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
<RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
<RepositoryBuildOrder Include="Antiforgery" Order="10" RootPath="$(RepositoryRoot)src\Antiforgery\" />
<RepositoryBuildOrder Include="IISIntegration" Order="10" RootPath="$(RepositoryRoot)src\IISIntegration\" />
<RepositoryBuildOrder Include="StaticFiles" Order="11" RootPath="$(RepositoryRoot)src\StaticFiles\" />
Expand All @@ -18,12 +17,11 @@
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
<RepositoryBuildOrder Include="CORS" Order="12" RootPath="$(RepositoryRoot)src\CORS\" />
<RepositoryBuildOrder Include="Routing" Order="12" RootPath="$(RepositoryRoot)src\Routing\" />
<RepositoryBuildOrder Include="Localization" Order="13" />
<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="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
<RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
Expand Down
2 changes: 2 additions & 0 deletions build/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
<MicrosoftExtensionsHostingAbstractionsPackageVersion>3.0.0-preview.18572.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsHostingPackageVersion>3.0.0-preview.18572.1</MicrosoftExtensionsHostingPackageVersion>
<MicrosoftExtensionsHttpPackageVersion>3.0.0-preview.18572.1</MicrosoftExtensionsHttpPackageVersion>
<MicrosoftExtensionsLocalizationAbstractionsPackageVersion>3.0.0-preview.18604.7</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
<MicrosoftExtensionsLocalizationPackageVersion>3.0.0-preview.18604.7</MicrosoftExtensionsLocalizationPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview.18572.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>3.0.0-preview.18572.1</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
<MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview.18572.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 @@ -50,6 +50,8 @@
<ExternalDependency Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsHostingAbstractionsPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsHostingPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Localization.Abstractions" Version="$(MicrosoftExtensionsLocalizationAbstractionsPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Localization" Version="$(MicrosoftExtensionsLocalizationPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Version="$(MicrosoftExtensionsLoggingAzureAppServicesPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Version="$(MicrosoftExtensionsLoggingConfigurationPackageVersion)" />
Expand Down
1 change: 1 addition & 0 deletions build/submodules.props
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<Repository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
<Repository Include="StaticFiles" RootPath="$(RepositoryRoot)src\StaticFiles\" />
<Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
<Repository Include="EntityFrameworkCore" />

<!-- Test-only repos -->
<Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
Expand Down
79 changes: 79 additions & 0 deletions eng/Baseline.props → eng/Baseline.Designer.props
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,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.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HostFiltering' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Hosting.Abstractions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting.Abstractions' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
Expand Down Expand Up @@ -242,6 +252,26 @@
<BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.HttpOverrides-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpOverrides' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpOverrides' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.HttpsPolicy-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpsPolicy' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HttpsPolicy' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.JsonPatch-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
Expand All @@ -250,6 +280,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.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization.Routing' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Localization" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Localization-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Localization' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.MiddlewareAnalysis-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.MiddlewareAnalysis' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
Expand All @@ -266,6 +314,37 @@
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.ResponseCompression-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' AND '$(TargetFramework)' == 'net461' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ResponseCompression' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Rewrite-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Rewrite' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Rewrite' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Server.Kestrel.Core-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Core' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
Expand Down
7 changes: 7 additions & 0 deletions eng/tools/BaselineGenerator/baseline.xml → eng/Baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.HostFiltering" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.2.0" />
Expand All @@ -29,9 +30,15 @@
<Package Id="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Http" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.HttpOverrides" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Localization.Routing" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Localization" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Owin" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Rewrite" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.2.0" />
Expand Down
Loading