Skip to content

Commit f4bb260

Browse files
author
Nate McMaster
committed
Merge branch release/2.1 into release/2.2
2 parents 21bdedb + 80bb14c commit f4bb260

File tree

224 files changed

+184
-2565
lines changed

Some content is hidden

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

224 files changed

+184
-2565
lines changed

‎build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Category="ship" />
109109
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Category="ship" />
110110
<PackageArtifact Include="Microsoft.AspNetCore.Mvc" Category="ship" />
111-
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices.Sockets" Category="noship" />
112111
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices" Category="ship" />
113112
<PackageArtifact Include="Microsoft.AspNetCore.Owin" Category="ship" />
114113
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Design" 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="EntityFrameworkCore" Order="8" />
1111
<RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
1212
<RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\" />
13-
<RepositoryBuildOrder Include="JavaScriptServices" Order="15" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
1413
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
1514
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
1615
<RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />

‎build/repo.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
6767
<ProjectToExclude Include="
6868
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
69+
$(RepositoryRoot)src\Middleware\NodeServices.Sockets\**\*.csproj;
6970
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
7071
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj
7172
" />

‎build/submodules.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737

3838
<ItemGroup>
3939
<Repository Include="Scaffolding" PatchPolicy="AlwaysUpdate" />
40-
<Repository Include="IISIntegration" RootPath="$(RepositoryRoot)src\IISIntegration\" />
4140
<Repository Include="Templating" RootPath="$(RepositoryRoot)src\Templating\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
4241
<Repository Include="EntityFrameworkCore" />
4342

@@ -50,7 +49,6 @@
5049
<ShippedRepository Include="AADIntegration" RootPath="$(RepositoryRoot)src\AADIntegration\" />
5150
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
5251
<ShippedRepository Include="Identity" RootPath="$(RepositoryRoot)src\Identity\" />
53-
<ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
5452
<ShippedRepository Include="MetaPackages" RootPath="$(RepositoryRoot)src\MetaPackages\" PatchPolicy="CascadeVersions" />
5553
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
5654
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />

‎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,19 +68,20 @@ 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" />
7677
<Package Id="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.2.0" />
77-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.2.0" />
7878
<Package Id="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
79+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="2.2.0" />
7980
<Package Id="Microsoft.AspNetCore.Owin" Version="2.2.0" />
80-
<Package Id="Microsoft.AspNetCore.Razor" Version="2.2.0" />
8181
<Package Id="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" />
8282
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="2.2.0" />
8383
<Package Id="Microsoft.AspNetCore.Razor.Runtime" Version="2.2.0" />
84+
<Package Id="Microsoft.AspNetCore.Razor" Version="2.2.0" />
8485
<Package Id="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.2.0" />
8586
<Package Id="Microsoft.AspNetCore.ResponseCaching" Version="2.2.0" />
8687
<Package Id="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
@@ -97,12 +98,14 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
9798
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.0" />
9899
<Package Id="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
99100
<Package Id="Microsoft.AspNetCore.Session" Version="2.2.0" />
101+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" />
102+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.2.0" />
100103
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
101104
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
102105
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.0" />
103106
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
104-
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.2.0" />
105107
<Package Id="Microsoft.AspNetCore" Version="2.2.0" />
108+
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.2.0" />
106109
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="2.2.0" />
107110
<Package Id="Microsoft.Net.Http.Headers" Version="2.2.0" />
108111
<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
@@ -78,11 +78,14 @@
7878
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Localization.Routing" ProjectPath="$(RepositoryRoot)src\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj" />
7979
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Localization" ProjectPath="$(RepositoryRoot)src\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj" />
8080
<ProjectReferenceProvider Include="Microsoft.AspNetCore.MiddlewareAnalysis" ProjectPath="$(RepositoryRoot)src\Middleware\MiddlewareAnalysis\src\Microsoft.AspNetCore.MiddlewareAnalysis.csproj" />
81+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.NodeServices" ProjectPath="$(RepositoryRoot)src\Middleware\NodeServices\src\Microsoft.AspNetCore.NodeServices.csproj" />
8182
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj" />
8283
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCaching" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj" />
8384
<ProjectReferenceProvider Include="Microsoft.AspNetCore.ResponseCompression" ProjectPath="$(RepositoryRoot)src\Middleware\ResponseCompression\src\Microsoft.AspNetCore.ResponseCompression.csproj" />
8485
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Rewrite" ProjectPath="$(RepositoryRoot)src\Middleware\Rewrite\src\Microsoft.AspNetCore.Rewrite.csproj" />
8586
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Session" ProjectPath="$(RepositoryRoot)src\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj" />
87+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices.Extensions" ProjectPath="$(RepositoryRoot)src\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj" />
88+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SpaServices" ProjectPath="$(RepositoryRoot)src\Middleware\SpaServices\src\Microsoft.AspNetCore.SpaServices.csproj" />
8689
<ProjectReferenceProvider Include="Microsoft.AspNetCore.StaticFiles" ProjectPath="$(RepositoryRoot)src\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj" />
8790
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebSockets" ProjectPath="$(RepositoryRoot)src\Middleware\WebSockets\src\Microsoft.AspNetCore.WebSockets.csproj" />
8891
<ProjectReferenceProvider Include="Microsoft.CodeAnalysis.Razor" ProjectPath="$(RepositoryRoot)src\Razor\CodeAnalysis.Razor\src\Microsoft.CodeAnalysis.Razor.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
}

‎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.

0 commit comments

Comments
 (0)