Skip to content

Commit 22f3166

Browse files
author
Nate McMaster
committed
Merge branch 'release/2.1' into release/2.2
2 parents a6b04bf + d383862 commit 22f3166

File tree

486 files changed

+1413
-1331
lines changed

Some content is hidden

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

486 files changed

+1413
-1331
lines changed

‎.azure/pipelines/jobs/default-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ jobs:
104104
- checkout: self
105105
clean: true
106106
- task: NodeTool@0
107+
displayName: Install Node 10.x
107108
inputs:
108109
versionSpec: 10.x
109110
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ src/**/global.json
2828
launchSettings.json
2929
korebuild-lock.txt
3030
.gradle/
31+
src/SignalR/clients/**/dist/

‎Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
<RepoRelativeProjectDir>$([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectDirectory)))</RepoRelativeProjectDir>
7878

79-
<IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance'))">true</IsBenchmarkProject>
79+
<IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance')) OR $(RepoRelativeProjectDir.Contains('perf'))">true</IsBenchmarkProject>
8080
<IsTestProject Condition="$(MSBuildProjectName.EndsWith('Tests')) OR $(MSBuildProjectName.EndsWith('.Test'))">true</IsTestProject>
8181
<IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
8282
<IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>
@@ -104,5 +104,6 @@
104104
<Import Project="eng\targets\CSharp.Common.props" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
105105
<Import Project="eng\targets\SharedFx.Common.props" Condition="'$(MSBuildProjectExtension)' == '.shfxproj'" />
106106
<Import Project="eng\targets\Wix.Common.props" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
107+
<Import Project="eng\targets\Npm.Common.props" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
107108

108109
</Project>

‎Directory.Build.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,5 @@
6363
<Import Project="eng\targets\FSharp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
6464
<Import Project="eng\targets\SharedFx.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.shfxproj'" />
6565
<Import Project="eng\targets\Wix.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
66+
<Import Project="eng\targets\Npm.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
6667
</Project>

‎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="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
1212
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
13-
<RepositoryBuildOrder Include="SignalR" Order="16" RootPath="$(RepositoryRoot)src\SignalR\" />
1413
<RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
1514
<RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
1615
</ItemGroup>

‎build/dependencies.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>
3030
<InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
3131
<InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
32-
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20190104.5</InternalAspNetCoreSdkPackageVersion>
32+
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20190110.1</InternalAspNetCoreSdkPackageVersion>
3333
</PropertyGroup>
3434

3535
<!-- These are package versions that should not be overridden or updated by automation. -->
@@ -175,7 +175,7 @@
175175
<MicrosoftNETCoreDotNetAppHost21PackageVersion>$(MicrosoftNETCoreApp21PackageVersion)</MicrosoftNETCoreDotNetAppHost21PackageVersion>
176176
<MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
177177
<MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
178-
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
178+
<MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
179179
<MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
180180
<MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion>
181181
<MicrosoftOwinTestingPackageVersion>3.0.1</MicrosoftOwinTestingPackageVersion>
@@ -273,7 +273,7 @@
273273
<XunitCorePackageVersion>2.3.1</XunitCorePackageVersion>
274274
<XunitExtensibilityCorePackageVersion>2.3.1</XunitExtensibilityCorePackageVersion>
275275
<XunitExtensibilityExecutionPackageVersion>2.3.1</XunitExtensibilityExecutionPackageVersion>
276-
<XunitPackageVersion>2.3.1</XunitPackageVersion>
276+
<XunitPackageVersion>2.4.0</XunitPackageVersion>
277277
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
278278
</PropertyGroup>
279279
</Project>

‎build/repo.props

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,19 @@
6464
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
6565
$(RepositoryRoot)src\Middleware\NodeServices.Sockets\**\*.csproj;
6666
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
67-
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj
67+
$(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj;
68+
$(RepositoryRoot)src\SignalR\clients\cpp\**\*.*proj;
69+
$(RepositoryRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj;
6870
" />
6971
</ItemGroup>
7072

7173
<Choose>
7274
<!-- Project selection can be overridden on the command line by passing in -projects -->
7375
<When Condition="'$(Projects)' != ''">
7476
<ItemGroup>
75-
<ProjectToBuild Include="$(Projects)" Exclude="@(ProjectToExclude)" />
77+
<ProjectToBuild Include="$(Projects)" Exclude="@(ProjectToExclude)">
78+
<RestoreInParallel Condition="'%(Extension)' == '.npmproj'">false</RestoreInParallel>
79+
</ProjectToBuild>
7680
</ItemGroup>
7781
</When>
7882
<Otherwise>
@@ -81,14 +85,21 @@
8185

8286
<ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/>
8387

84-
<NpmProjectDirectory Include="$(RepositoryRoot)src\Middleware\CORS\test\FunctionalTests\" />
85-
8688
<ProjectToBuild Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' " Include="$(RepositoryRoot)src\Servers\**\*.vcxproj">
8789
<!-- Required to prevent triggering double-builds. See eng\targets\ResolveIisReferences.targets for details. -->
8890
<AdditionalProperties Condition="'$(SharedFxRid)' == 'win-x64'">Platform=x64</AdditionalProperties>
8991
<AdditionalProperties Condition="'$(SharedFxRid)' == 'win-x86'">Platform=x86</AdditionalProperties>
9092
</ProjectToBuild>
9193

94+
<ProjectToBuild Condition="'$(SkipNpm)' != 'true'"
95+
Include="$(RepositoryRoot)src\SignalR\**\*.npmproj"
96+
RestoreInParallel="false"
97+
Exclude="@(ProjectToExclude)" />
98+
99+
<ProjectToBuild Condition="'$(SkipJavaClient)' != 'true'"
100+
Include="$(RepositoryRoot)src\SignalR\**\*.javaproj"
101+
Exclude="@(ProjectToExclude)" />
102+
92103
<ProjectToBuild Include="
93104
$(RepositoryRoot)src\DefaultBuilder\**\*.*proj;
94105
$(RepositoryRoot)src\Features\JsonPatch\**\*.*proj;
@@ -108,11 +119,15 @@
108119
$(RepositoryRoot)src\Mvc\**\*.*proj;
109120
$(RepositoryRoot)src\Azure\**\*.*proj;
110121
$(RepositoryRoot)src\MusicStore\**\*.*proj;
122+
$(RepositoryRoot)src\SignalR\**\*.csproj;
111123
"
112124
Exclude="
113125
@(ProjectToExclude);
126+
$(RepositoryRoot)**\node_modules\**\*;
114127
$(RepositoryRoot)**\bin\**\*;
115-
$(RepositoryRoot)**\obj\**\*;" />
128+
$(RepositoryRoot)**\obj\**\*;">
129+
<RestoreInParallel Condition="'%(Extension)' == '.npmproj'">false</RestoreInParallel>
130+
</ProjectToBuild>
116131
</ItemGroup>
117132
</Otherwise>
118133
</Choose>

‎build/repo.targets

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<PrepareDependsOn>SetTeamCityBuildNumberToVersion;$(PrepareDependsOn)</PrepareDependsOn>
1919
<PrepareDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths</PrepareDependsOn>
2020
<CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanRepoArtifacts</CleanDependsOn>
21-
<RestoreDependsOn Condition=" '$(SkipNpm)' != 'true' ">$(RestoreDependsOn);RestoreNpm</RestoreDependsOn>
2221
<RestoreDependsOn>$(RestoreDependsOn);InstallDotNet;RestoreProjects</RestoreDependsOn>
2322
<CompileDependsOn>$(CompileDependsOn);BuildProjects;PackSharedSources</CompileDependsOn>
2423
<CompileDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(CompileDependsOn);PackProjects;BuildRepositories;BuildSharedFx</CompileDependsOn>
@@ -32,13 +31,6 @@
3231
<GetArtifactInfoDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(GetArtifactInfoDependsOn);ResolveRepoInfo</GetArtifactInfoDependsOn>
3332
</PropertyGroup>
3433

35-
<Target Name="RestoreNpm" Condition="@(NpmProjectDirectory->Count()) != 0">
36-
<Message Text="Restoring NPM modules" Importance="high" />
37-
38-
<!-- Always run `npm ci` because `npm install` has a tendancy to churn package-lock.json for no apparent reason. -->
39-
<Exec Command="npm ci" WorkingDirectory="%(NpmProjectDirectory.Identity)" Condition=" '%(NpmProjectDirectory.Identity)' != '' " />
40-
</Target>
41-
4234
<Target Name="PrepareOutputPaths">
4335
<MakeDir Directories="$(ArtifactsDir);$(BuildDir)" />
4436
</Target>

‎build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,5 @@
4646

4747
<ItemGroup>
4848
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
49-
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />
5049
</ItemGroup>
5150
</Project>

‎docs/BuildFromSource.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ Build ASP.NET Core from Source
33

44
Building ASP.NET Core from source allows you tweak and customize ASP.NET Core, and to contribute your improvements back to the project.
55

6-
:warning: We are currently in the middle of restructing our source code. These instructions will likely change rapidly during November and December 2018.
7-
86
See https://github.com/aspnet/AspNetCore/labels/area-infrastructure for known issues and to track ongoing work.
97

108
## Install pre-requistes

0 commit comments

Comments
 (0)