Skip to content

Commit e8d898d

Browse files
jkotalikjkotalik
committed
Merge branch 'release/2.2'
2 parents b87ac1d + f4bb260 commit e8d898d

File tree

227 files changed

+195
-6858
lines changed

Some content is hidden

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

227 files changed

+195
-6858
lines changed

‎build/buildorder.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
<ItemGroup>
1010
<RepositoryBuildOrder Include="AADIntegration" Order="15" />
1111
<RepositoryBuildOrder Include="Identity" Order="15" />
12-
<RepositoryBuildOrder Include="JavaScriptServices" Order="15" />
1312
<RepositoryBuildOrder Include="AzureIntegration" Order="15" />
1413
<RepositoryBuildOrder Include="MusicStore" Order="16" />
1514
<RepositoryBuildOrder Include="SignalR" Order="16" />
1615
<RepositoryBuildOrder Include="AuthSamples" Order="16" />
17-
<RepositoryBuildOrder Include="Components" Order="17" />
1816
<RepositoryBuildOrder Include="Templating" Order="18" />
1917
</ItemGroup>
2018
</Project>

‎build/submodules.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
<ItemGroup>
3939
<Repository Include="AADIntegration" />
4040
<Repository Include="AzureIntegration" />
41-
<Repository Include="Components" />
4241
<Repository Include="Identity" />
43-
<Repository Include="JavaScriptServices" />
4442
<Repository Include="SignalR" />
4543
<Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
4644

‎eng/Baseline.Designer.props

Lines changed: 87 additions & 59 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
1212
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
1313
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.0" />
1414
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.0" />
15-
<Package Id="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
1615
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
1716
<Package Id="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
1817
<Package Id="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />
@@ -24,11 +23,12 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
2423
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.2.0" />
2524
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="2.2.0" />
2625
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="2.2.0" />
27-
<Package Id="Microsoft.AspNetCore.Authorization" Version="2.2.0" />
26+
<Package Id="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
2827
<Package Id="Microsoft.AspNetCore.Authorization.Policy" Version="2.2.0" />
28+
<Package Id="Microsoft.AspNetCore.Authorization" Version="2.2.0" />
2929
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" />
30-
<Package Id="Microsoft.AspNetCore.Cors" Version="2.2.0" />
3130
<Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.2.0" />
31+
<Package Id="Microsoft.AspNetCore.Cors" Version="2.2.0" />
3232
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="2.2.0" />
3333
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.2.0" />
3434
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.2.0" />
@@ -68,18 +68,19 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
6868
<Package Id="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" />
6969
<Package Id="Microsoft.AspNetCore.Mvc.Formatters.Xml" Version="2.2.0" />
7070
<Package Id="Microsoft.AspNetCore.Mvc.Localization" Version="2.2.0" />
71+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.2.0" />
7172
<Package Id="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" />
7273
<Package Id="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.2.0" />
7374
<Package Id="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.2.0" />
7475
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
7576
<Package Id="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
76-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.2.0" />
7777
<Package Id="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
78+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="2.2.0" />
7879
<Package Id="Microsoft.AspNetCore.Owin" Version="2.2.0" />
79-
<Package Id="Microsoft.AspNetCore.Razor" Version="2.2.0" />
8080
<Package Id="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" />
8181
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="2.2.0" />
8282
<Package Id="Microsoft.AspNetCore.Razor.Runtime" Version="2.2.0" />
83+
<Package Id="Microsoft.AspNetCore.Razor" Version="2.2.0" />
8384
<Package Id="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.2.0" />
8485
<Package Id="Microsoft.AspNetCore.ResponseCaching" Version="2.2.0" />
8586
<Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
@@ -96,12 +97,14 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
9697
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.0" />
9798
<Package Id="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
9899
<Package Id="Microsoft.AspNetCore.Session" Version="2.2.0" />
100+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" />
101+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.2.0" />
99102
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
100103
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
101104
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.0" />
102105
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
103-
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.2.0" />
104106
<Package Id="Microsoft.AspNetCore" Version="2.2.0" />
107+
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.2.0" />
105108
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="2.2.0" />
106109
<Package Id="Microsoft.Net.Http.Headers" Version="2.2.0" />
107110
<Package Id="Microsoft.Net.Sdk.Razor" Version="2.2.0" />

‎eng/ProjectReferences.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,14 @@
7777
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Localization.Routing" ProjectPath="$(RepositoryRoot)src\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj" />
7878
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Localization" ProjectPath="$(RepositoryRoot)src\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj" />
7979
<ProjectReferenceProvider Include="Microsoft.AspNetCore.MiddlewareAnalysis" ProjectPath="$(RepositoryRoot)src\Middleware\MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj" />
80+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.NodeServices" ProjectPath="$(RepositoryRoot)src\Middleware\NodeServices\src\Microsoft.AspNetCore.NodeServices.csproj" />
8081
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj" />
8182
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj" />
8283
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCompression" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj" />
8384
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Rewrite" ProjectPath="$(RepositoryRoot)src\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj" />
8485
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Session" ProjectPath="$(RepositoryRoot)src\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj" />
86+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices.Extensions" ProjectPath="$(RepositoryRoot)src\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj" />
87+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices" ProjectPath="$(RepositoryRoot)src\Middleware\SpaServices\src\Microsoft.AspNetCore.SpaServices.csproj" />
8588
<ProjectReferenceProvider Include="Microsoft.AspNetCore.StaticFiles" ProjectPath="$(RepositoryRoot)src\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj" />
8689
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
8790
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor.Runtime" ProjectPath="$(RepositoryRoot)src\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj" />

‎korebuild.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81",
1818
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
1919
"Microsoft.VisualStudio.Component.VC.ATL",
20-
"Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop"
20+
"Microsoft.VisualStudio.Component.Windows10SDK.17134"
2121
]
2222
}
2323
}

‎modules/Scaffolding

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 2f81b98c133c24ec699f370bf07b557dd484c646

‎src/Installers/Windows/AspNetCoreModule-Setup/build/settings/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<!-- General properties -->
1414

1515
<PropertyGroup>
16-
<IisOobWinSdkVersion Condition="'$(IisOobWinSdkVersion)' == ''">10.0.15063.0</IisOobWinSdkVersion>
16+
<IisOobWinSdkVersion Condition="'$(IisOobWinSdkVersion)' == ''">10.0.17134.0</IisOobWinSdkVersion>
1717
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$(IisOobWinSdkVersion)</WindowsTargetPlatformVersion>
1818
<CharacterSet>Unicode</CharacterSet>
1919
<OutDir>bin\$(Configuration)\$(PlatformShortname)\</OutDir>

‎src/JavaScriptServices/.gitignore

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎src/JavaScriptServices/Directory.Build.props

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)