Skip to content

Commit 85e2147

Browse files
author
Nate McMaster
committed
Merge branch 'release/2.2'
2 parents f1aacdb + 1670a2b commit 85e2147

File tree

629 files changed

+807
-2490
lines changed

Some content is hidden

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

629 files changed

+807
-2490
lines changed

‎Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' ">
1111
<!-- Always include framework metapackages in patch updates. -->
12-
<IsPackageInThisPatch Condition="'$(IsFrameworkMetapackage)' == 'true'">true</IsPackageInThisPatch>
12+
<IsPackageInThisPatch Condition="'$(IsFrameworkMetapackage)' == 'true' OR '$(IsSharedSourcePackage)' == 'true' ">true</IsPackageInThisPatch>
1313
<IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
1414
</PropertyGroup>
1515

‎THIRD-PARTY-NOTICES.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,14 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
8484
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
8585
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
8686
SOFTWARE
87+
88+
License notice for viz.js
89+
------------------------------------
90+
91+
Copyright (c) 2014-2018 Michael Daines
92+
93+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
94+
95+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
96+
97+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎build/PackageArchive.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ArchiveProjects Include="$(RepositoryRoot)src\PackageArchive\Archive.*\*.*proj" />
99
</ItemGroup>
1010

11-
<Target Name="BuildFallbackArchive" DependsOnTargets="GetProjectArtifactInfo;GetFxProjectArtifactInfo;ResolveRepoInfo;GeneratePropsFiles">
11+
<Target Name="BuildFallbackArchive" DependsOnTargets="ResolveSharedSourcesPackageInfo;GetProjectArtifactInfo;GetFxProjectArtifactInfo;ResolveRepoInfo;GeneratePropsFiles">
1212
<PropertyGroup>
1313
<ArchiveBuildProps>
1414
DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);

‎build/Publish.targets

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,15 @@
7373
<RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-$(PackageVersion).zip</RelativeBlobPath>
7474
</FilesToPublish>
7575

76-
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip" >
76+
<!-- This file is conditionally included because it may not exist in servicing builds -->
77+
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip"
78+
Condition="Exists('$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip')" >
7779
<RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip</RelativeBlobPath>
7880
</FilesToPublish>
7981

80-
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip" >
82+
<!-- This file is conditionally included because it may not exist in servicing builds -->
83+
<FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip"
84+
Condition="Exists('$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip')">
8185
<RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip</RelativeBlobPath>
8286
</FilesToPublish>
8387

‎build/RepositoryBuild.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787
<RepositoryBuildArguments>$(RepositoryBuildArguments) /p:BuildNumberSuffix=$(BuildNumberSuffix)</RepositoryBuildArguments>
8888
<RepositoryBuildArguments>$(RepositoryBuildArguments) /p:Configuration=$(Configuration)</RepositoryBuildArguments>
8989
<RepositoryBuildArguments>$(RepositoryBuildArguments) /p:IsFinalBuild=$(IsFinalBuild)</RepositoryBuildArguments>
90+
<!-- We collect all output and code sign at the end. We don't need to code sign when we build each submodule. -->
91+
<RepositoryBuildArguments>$(RepositoryBuildArguments) /p:DisableCodeSigning=true</RepositoryBuildArguments>
9092
<RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:DotNetAssetRootAccessTokenSuffix=$(DotNetAssetRootAccessTokenSuffix)'</RepositoryBuildArguments>
9193
<RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:DotNetAssetRootUrl=$(DotNetAssetRootUrl)'</RepositoryBuildArguments>
9294
<RepositoryBuildArguments Condition=" '$(SkipTestsDueToMissingSharedFx)' == 'true' ">$(RepositoryBuildArguments) /p:SkipAspNetCoreRuntimeInstall=true</RepositoryBuildArguments>

‎build/SharedFx.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</SharedFxBuildProperties>
5656
</PropertyGroup>
5757

58-
<MSBuild Projects="$(MSBuildToolsPath)\NuGet.targets"
58+
<MSBuild Projects="$(NuGetRestoreTargets)"
5959
Targets="Restore"
6060
Properties="$(SharedFxBuildProperties);RestoreGraphProjectInput=$(_RestoreGraphProjectInput);_DummyTarget=Restore" />
6161

‎build/artifacts.props

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@
7878

7979
<!-- Packages for internal use only. -->
8080
<PackageArtifact Include="AspNetCoreRuntime.3.0.$(SharedFxArchitecture)" Category="noship" Condition=" '$(SharedFxRid)' == 'win-x64' OR '$(SharedFxRid)' == 'win-x86' " />
81-
<PackageArtifact Include="Internal.AspNetCore.Universe.Lineup" Category="noship" />
82-
<PackageArtifact Include="Internal.WebHostBuilderFactory.Sources" Category="noship" />
8381
<PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" Category="noship" />
8482
<PackageArtifact Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Category="noship" />
8583
<PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModule" Category="noship" Condition=" '$(OS)' == 'Windows_NT' " />
@@ -119,7 +117,6 @@
119117
<PackageArtifact Include="Microsoft.AspNetCore.Http" Category="noship" />
120118
<PackageArtifact Include="Microsoft.AspNetCore.HttpOverrides" Category="noship" />
121119
<PackageArtifact Include="Microsoft.AspNetCore.HttpsPolicy" Category="noship" />
122-
<PackageArtifact Include="Microsoft.AspNetCore.HttpSys.Sources" Category="noship" />
123120
<PackageArtifact Include="Microsoft.AspNetCore.Identity" Category="noship" />
124121
<PackageArtifact Include="Microsoft.AspNetCore.Localization.Routing" Category="noship" />
125122
<PackageArtifact Include="Microsoft.AspNetCore.Localization" Category="noship" />
@@ -145,7 +142,6 @@
145142
<PackageArtifact Include="Microsoft.AspNetCore.ResponseCompression" Category="noship" />
146143
<PackageArtifact Include="Microsoft.AspNetCore.Rewrite" Category="noship" />
147144
<PackageArtifact Include="Microsoft.AspNetCore.Routing.Abstractions" Category="noship" />
148-
<PackageArtifact Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Category="noship" />
149145
<PackageArtifact Include="Microsoft.AspNetCore.Routing" Category="noship" />
150146
<PackageArtifact Include="Microsoft.AspNetCore.Server.HttpSys" Category="noship" />
151147
<PackageArtifact Include="Microsoft.AspNetCore.Server.IIS" Category="noship" />
@@ -165,9 +161,8 @@
165161
<PackageArtifact Include="Microsoft.AspNetCore.WebUtilities" Category="noship" />
166162
<PackageArtifact Include="Microsoft.AspNetCore" Category="noship" />
167163
<PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" />
168-
<PackageArtifact Include="Microsoft.Extensions.Buffers.MemoryPool.Sources" Category="noship" />
169-
<PackageArtifact Include="Microsoft.Extensions.Buffers.Testing.Sources" Category="noship" />
170164
<PackageArtifact Include="Microsoft.Net.Http.Headers" Category="noship" />
171165
<PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
166+
<PackageArtifact Include="Internal.WebHostBuilderFactory.Sources" Category="noship"/>
172167
</ItemGroup>
173168
</Project>

‎build/buildorder.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88

99
<ItemGroup>
1010
<RepositoryBuildOrder Include="Razor" Order="6" />
11-
<RepositoryBuildOrder Include="HttpSysServer" Order="8" />
1211
<RepositoryBuildOrder Include="Antiforgery" Order="10" />
1312
<RepositoryBuildOrder Include="IISIntegration" Order="10" />
1413
<RepositoryBuildOrder Include="StaticFiles" Order="11" />
1514
<RepositoryBuildOrder Include="ResponseCaching" Order="11" />
1615
<RepositoryBuildOrder Include="Session" Order="11" />
1716
<RepositoryBuildOrder Include="ServerTests" Order="11" />
1817
<RepositoryBuildOrder Include="CORS" Order="12" />
19-
<RepositoryBuildOrder Include="Routing" Order="12" />
2018
<RepositoryBuildOrder Include="Security" Order="13" />
2119
<RepositoryBuildOrder Include="MetaPackages" Order="13" />
2220
<RepositoryBuildOrder Include="Mvc" Order="14" />

‎build/lineups/Internal.AspNetCore.Universe.Lineup.nuspec

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

‎build/repo.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,11 @@
1717
<DependencyPackageDir>$(RepositoryRoot).deps\build\</DependencyPackageDir>
1818
<SignedDependencyPackageDir>$(RepositoryRoot).deps\Signed\Packages\</SignedDependencyPackageDir>
1919
<SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile>
20-
<!-- This creates false-positives on many of the native .dll's we produce or re-distribute from other teams. -->
21-
<DisableSignCheckStrongName>true</DisableSignCheckStrongName>
22-
2320
<SharedSourcesFolder>$(RepositoryRoot)src\Shared\</SharedSourcesFolder>
2421
</PropertyGroup>
2522

2623
<ItemGroup>
27-
<SharedSourceDirectories Include="$([System.IO.Directory]::GetDirectories($(SharedSourcesFolder)))" />
28-
<SharedSourceDirectories Remove="$(RepositoryRoot)src\Shared\Diagnostics\" />
24+
<SharedSourceDirectories Include="$(SharedSourcesFolder)Hosting.WebHostBuilderFactory\" />
2925
</ItemGroup>
3026

3127
<ItemGroup>
@@ -65,7 +61,7 @@
6561
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
6662
<ProjectToExclude Include="
6763
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
68-
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
64+
$(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj
6965
" />
7066

7167
<ProjectToBuild Include="
@@ -78,7 +74,11 @@
7874
$(RepositoryRoot)src\Tools\**\*.*proj;
7975
$(RepositoryRoot)src\Middleware\**\*.*proj;
8076
"
81-
Exclude="@(ProjectToExclude)" />
77+
Exclude="
78+
@(ProjectToExclude);
79+
$(RepositoryRoot)**\bin\**\*;
80+
$(RepositoryRoot)**\obj\**\*;
81+
$(RepositoryRoot)**\AutobahnTestApp\**\*;" />
8282
</ItemGroup>
8383

8484
<!-- Properties for publishing -->

0 commit comments

Comments
 (0)