Skip to content

Commit 68f0aff

Browse files
jkotalikJunTaoLuo
jkotalik
authored and
JunTaoLuo
committed
security to project ref (#4618)
1 parent 13ae005 commit 68f0aff

File tree

388 files changed

+743
-1328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

388 files changed

+743
-1328
lines changed

‎.gitmodules

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[submodule "modules/EntityFrameworkCore"]
2-
path = modules/EntityFrameworkCore
3-
url = https://github.com/aspnet/EntityFrameworkCore.git
4-
branch = release/2.1
2+
path = modules/EntityFrameworkCore
3+
url = https://github.com/aspnet/EntityFrameworkCore.git
4+
branch = release/2.1
55
[submodule "modules/Scaffolding"]
6-
path = modules/Scaffolding
7-
url = https://github.com/aspnet/Scaffolding.git
8-
branch = release/2.1
6+
path = modules/Scaffolding
7+
url = https://github.com/aspnet/Scaffolding.git
8+
branch = release/2.1

‎build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<PackageArtifact Include="Microsoft.AspNetCore.Authorization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
5050
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" AllMetapackage="true" Category="ship" />
5151
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" AllMetapackage="true" Category="ship" />
52-
<PackageArtifact Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Category="noship" />
5352
<PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
5453
<PackageArtifact Include="Microsoft.AspNetCore.CookiePolicy" AllMetapackage="true" AppMetapackage="true" Category="ship" />
5554
<PackageArtifact Include="Microsoft.AspNetCore.Cors" AllMetapackage="true" AppMetapackage="true" Category="ship" />

‎build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<RepositoryBuildOrder Include="Razor" Order="6" RootPath="$(RepositoryRoot)src\Razor\" />
1111
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
1212
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
13-
<RepositoryBuildOrder Include="Security" Order="13" RootPath="$(RepositoryRoot)src\Security\" />
1413
<RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />
1514
<RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
1615
<RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\" />

‎build/repo.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
$(RepositoryRoot)src\Html\**\*.*proj;
7676
$(RepositoryRoot)src\Servers\**\*.csproj;
7777
$(RepositoryRoot)src\Servers\**\*.pkgproj;
78+
$(RepositoryRoot)src\Security\**\*.*proj;
7879
$(RepositoryRoot)src\Shared\**\*.*proj;
7980
$(RepositoryRoot)src\Tools\**\*.*proj;
8081
$(RepositoryRoot)src\Middleware\**\*.*proj;

‎build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<ShippedRepository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />
5656
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
5757
<ShippedRepository Include="Razor" RootPath="$(RepositoryRoot)src\Razor\" />
58-
<ShippedRepository Include="Security" RootPath="$(RepositoryRoot)src\Security\" />
5958
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
6059
</ItemGroup>
6160
</Project>

‎eng/Baseline.Designer.props

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@
5757
<BaselinePackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="[2.1.1, )" />
5858
<BaselinePackageReference Include="Microsoft.Extensions.ObjectPool" Version="[2.1.1, )" />
5959
</ItemGroup>
60+
<!-- Package: Microsoft.AspNetCore.Authentication-->
61+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication' ">
62+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
63+
</PropertyGroup>
64+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication' AND '$(TargetFramework)' == 'netstandard2.0' ">
65+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.1.1, )" />
66+
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.1.1, )" />
67+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
68+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
69+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
70+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
71+
<BaselinePackageReference Include="Microsoft.Extensions.WebEncoders" Version="[2.1.1, )" />
72+
</ItemGroup>
6073
<!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
6174
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Abstractions' ">
6275
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -66,6 +79,13 @@
6679
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
6780
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
6881
</ItemGroup>
82+
<!-- Package: Microsoft.AspNetCore.Authentication.Cookies-->
83+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Cookies' ">
84+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
85+
</PropertyGroup>
86+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Cookies' AND '$(TargetFramework)' == 'netstandard2.0' ">
87+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.1.2, )" />
88+
</ItemGroup>
6989
<!-- Package: Microsoft.AspNetCore.Authentication.Core-->
7090
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Core' ">
7191
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -75,6 +95,83 @@
7595
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.1.1, )" />
7696
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
7797
</ItemGroup>
98+
<!-- Package: Microsoft.AspNetCore.Authentication.Facebook-->
99+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Facebook' ">
100+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
101+
</PropertyGroup>
102+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Facebook' AND '$(TargetFramework)' == 'netstandard2.0' ">
103+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
104+
</ItemGroup>
105+
<!-- Package: Microsoft.AspNetCore.Authentication.Google-->
106+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' ">
107+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
108+
</PropertyGroup>
109+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' AND '$(TargetFramework)' == 'netstandard2.0' ">
110+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
111+
</ItemGroup>
112+
<!-- Package: Microsoft.AspNetCore.Authentication.JwtBearer-->
113+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' ">
114+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
115+
</PropertyGroup>
116+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' AND '$(TargetFramework)' == 'netstandard2.0' ">
117+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.1.2, )" />
118+
<BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[5.2.0, )" />
119+
</ItemGroup>
120+
<!-- Package: Microsoft.AspNetCore.Authentication.MicrosoftAccount-->
121+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.MicrosoftAccount' ">
122+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
123+
</PropertyGroup>
124+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.MicrosoftAccount' AND '$(TargetFramework)' == 'netstandard2.0' ">
125+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
126+
</ItemGroup>
127+
<!-- Package: Microsoft.AspNetCore.Authentication.OAuth-->
128+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OAuth' ">
129+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
130+
</PropertyGroup>
131+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OAuth' AND '$(TargetFramework)' == 'netstandard2.0' ">
132+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.1.2, )" />
133+
<BaselinePackageReference Include="Newtonsoft.Json" Version="[11.0.2, )" />
134+
</ItemGroup>
135+
<!-- Package: Microsoft.AspNetCore.Authentication.OpenIdConnect-->
136+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' ">
137+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
138+
</PropertyGroup>
139+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' AND '$(TargetFramework)' == 'netstandard2.0' ">
140+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
141+
<BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[5.2.0, )" />
142+
</ItemGroup>
143+
<!-- Package: Microsoft.AspNetCore.Authentication.Twitter-->
144+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Twitter' ">
145+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
146+
</PropertyGroup>
147+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Twitter' AND '$(TargetFramework)' == 'netstandard2.0' ">
148+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="[2.1.2, )" />
149+
</ItemGroup>
150+
<!-- Package: Microsoft.AspNetCore.Authentication.WsFederation-->
151+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' ">
152+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
153+
</PropertyGroup>
154+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' AND '$(TargetFramework)' == 'netstandard2.0' ">
155+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication" Version="[2.1.2, )" />
156+
<BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="[5.2.0, )" />
157+
<BaselinePackageReference Include="System.IdentityModel.Tokens.Jwt" Version="[5.2.0, )" />
158+
</ItemGroup>
159+
<!-- Package: Microsoft.AspNetCore.Authorization-->
160+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' ">
161+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
162+
</PropertyGroup>
163+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND '$(TargetFramework)' == 'netstandard2.0' ">
164+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
165+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
166+
</ItemGroup>
167+
<!-- Package: Microsoft.AspNetCore.Authorization.Policy-->
168+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization.Policy' ">
169+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
170+
</PropertyGroup>
171+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization.Policy' AND '$(TargetFramework)' == 'netstandard2.0' ">
172+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[2.1.2, )" />
173+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="[2.1.1, )" />
174+
</ItemGroup>
78175
<!-- Package: Microsoft.AspNetCore.Connections.Abstractions-->
79176
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' ">
80177
<BaselinePackageVersion>2.1.3</BaselinePackageVersion>
@@ -83,6 +180,15 @@
83180
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[2.1.1, )" />
84181
<BaselinePackageReference Include="System.IO.Pipelines" Version="[4.5.0, )" />
85182
</ItemGroup>
183+
<!-- Package: Microsoft.AspNetCore.CookiePolicy-->
184+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' ">
185+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
186+
</PropertyGroup>
187+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.CookiePolicy' AND '$(TargetFramework)' == 'netstandard2.0' ">
188+
<BaselinePackageReference Include="Microsoft.AspNetCore.Http" Version="[2.1.1, )" />
189+
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.1.1, )" />
190+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
191+
</ItemGroup>
86192
<!-- Package: Microsoft.AspNetCore.Cors-->
87193
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cors' ">
88194
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -591,4 +697,12 @@
591697
<BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[2.1.1, )" />
592698
<BaselinePackageReference Include="System.Buffers" Version="[4.5.0, )" />
593699
</ItemGroup>
700+
<!-- Package: Microsoft.Owin.Security.Interop-->
701+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Owin.Security.Interop' ">
702+
<BaselinePackageVersion>2.1.2</BaselinePackageVersion>
703+
</PropertyGroup>
704+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Owin.Security.Interop' AND '$(TargetFramework)' == 'net461' ">
705+
<BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="[2.1.1, )" />
706+
<BaselinePackageReference Include="Microsoft.Owin.Security" Version="[3.0.1, )" />
707+
</ItemGroup>
594708
</Project>

‎eng/Baseline.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,22 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
1111
<Package Id="dotnet-watch" Version="2.1.1" />
1212
<Package Id="Microsoft.AspNetCore" Version="2.1.6" />
1313
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" />
14+
<Package Id="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
1415
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.1.1" />
16+
<Package Id="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.2" />
1517
<Package Id="Microsoft.AspNetCore.Authentication.Core" Version="2.1.1" />
18+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="2.1.2" />
19+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="2.1.2" />
20+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
21+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.1.2" />
22+
<Package Id="Microsoft.AspNetCore.Authentication.OAuth" Version="2.1.2" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.2" />
24+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="2.1.2" />
25+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="2.1.2" />
26+
<Package Id="Microsoft.AspNetCore.Authorization" Version="2.1.2" />
27+
<Package Id="Microsoft.AspNetCore.Authorization.Policy" Version="2.1.2" />
1628
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.3" />
29+
<Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.1.2" />
1730
<Package Id="Microsoft.AspNetCore.Cors" Version="2.1.1" />
1831
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.1.1" />
1932
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
@@ -64,4 +77,5 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
6477
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
6578
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
6679
<Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" />
80+
<Package Id="Microsoft.Owin.Security.Interop" Version="2.1.2" />
6781
</Baseline>

‎eng/Dependencies.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ and are generated based on the last package release.
5050
<LatestPackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
5151
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
5252
<LatestPackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
53+
<LatestPackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
5354
<LatestPackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
5455
<LatestPackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion)" />
5556
<LatestPackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
5657
<LatestPackageReference Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="$(MicrosoftExtensionsTypeNameHelperSourcesPackageVersion)" />
5758
<LatestPackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(MicrosoftExtensionsWebEncodersPackageVersion)" />
59+
<LatestPackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="$(MicrosoftIdentityModelClientsActiveDirectoryPackageVersion)" />
60+
<LatestPackageReference Include="Microsoft.Owin.Security.Cookies" Version="$(MicrosoftOwinSecurityCookiesPackageVersion)" />
61+
<LatestPackageReference Include="Microsoft.Owin.Testing" Version="$(MicrosoftOwinTestingPackageVersion)" />
5862
<LatestPackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" />
5963
<LatestPackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
6064
<LatestPackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
@@ -68,6 +72,7 @@ and are generated based on the last package release.
6872
<LatestPackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" />
6973
<LatestPackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" />
7074
<LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
75+
7176
</ItemGroup>
7277

7378
<ItemGroup Label="External dependencies">

0 commit comments

Comments
 (0)