huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update branding to 2.2.2 (#6608) 

- pin System.Net.WebSockets.WebSocketProtocol to version 4.5.3
- update Directory.Build.targets files to correct build issues
- fix duplicate metadata during static analysis
This commit is contained in:
Doug Bunting 2019-01-14 11:40:01 -08:00 committed by GitHub
parent 089912cd1b
commit 970bced25c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/dependencies.props
View File

@ -2,9 +2,8 @@
<!-- These package versions may be overridden or updated by automation. -->
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
<!-- MicrosoftNETCoreApp22PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
<MicrosoftNETCoreAppPackageVersion>2.2.0</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.0</MicrosoftNETCoreDotNetAppHostPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.2</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.2.1</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.1</MicrosoftNETCoreDotNetAppHostPackageVersion>
</PropertyGroup>
<PropertyGroup>
@ -254,6 +253,7 @@
<SystemThreadingTasksDataflowPackageVersion>4.9.0</SystemThreadingTasksDataflowPackageVersion>
<SystemThreadingTasksExtensionsPackageVersion>4.5.1</SystemThreadingTasksExtensionsPackageVersion>
<SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.3</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<Utf8JsonPackageVersion>1.3.7</Utf8JsonPackageVersion>
<VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
<VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCommonPackageVersion>

8
build/repo.targets
View File

@ -96,14 +96,6 @@
<Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
</MSBuild>
<MSBuild Projects="@(ProjectToBuild)"
Targets="GetArtifactInfo"
Properties="$(DesignTimeBuildProps);Configuration=$(Configuration);BuildNumber=$(BuildNumber);DesignTimeBuild=true"
SkipNonexistentTargets="true"
BuildInParallel="true">
<Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
</MSBuild>
<MSBuild Projects="@(_RepositoryProject)"
Targets="ResolveSolutions"
Properties="$(DesignTimeBuildProps);Configuration=$(Configuration);BuildNumber=$(BuildNumber)"

22
eng/Baseline.Designer.props
View File

@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<AspNetCoreBaselineVersion>2.2.0</AspNetCoreBaselineVersion>
<AspNetCoreBaselineVersion>2.2.1</AspNetCoreBaselineVersion>
</PropertyGroup>
<!-- Package: dotnet-dev-certs-->
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@ -77,11 +77,11 @@
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.AspNetCoreModule-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
</PropertyGroup>
<!-- Package: Microsoft.AspNetCore.AspNetCoreModuleV2-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
</PropertyGroup>
<!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Abstractions' ">
@ -361,7 +361,7 @@
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' " />
<!-- Package: Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="[2.2.0, )" />
@ -951,7 +951,7 @@
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Server.IIS-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IIS' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IIS' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
@ -962,7 +962,7 @@
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Server.IISIntegration-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
@ -1045,16 +1045,16 @@
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.Server.Kestrel-->
@ -1228,13 +1228,13 @@
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.WebSockets-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebSockets' ">
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebSockets' AND '$(TargetFramework)' == 'netstandard2.0' ">
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
<BaselinePackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="[4.5.1, )" />
<BaselinePackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="[4.5.3, )" />
</ItemGroup>
<!-- Package: Microsoft.AspNetCore.WebUtilities-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebUtilities' ">

16
eng/Baseline.xml
View File

@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
-->
<Baseline Version="2.2.0">
<Baseline Version="2.2.1">
<Package Id="dotnet-dev-certs" Version="2.2.0" />
<Package Id="dotnet-sql-cache" Version="2.2.0" />
<Package Id="dotnet-user-secrets" Version="2.2.0" />
@ -12,8 +12,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="2.2.0-preview-35687" />
<Package Id="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.1" />
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.1" />
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.2.0" />
@ -46,7 +46,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.2.1" />
<Package Id="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.HostFiltering" Version="2.2.0" />
@ -102,13 +102,13 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Routing" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.IIS" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.IIS" Version="2.2.1" />
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.1" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.Session" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="1.1.0" />
@ -125,7 +125,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
<Package Id="Microsoft.AspNetCore" Version="2.2.0" />
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.2.0" />

4
eng/PatchConfig.props
View File

@ -25,5 +25,9 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
</PackagesInPatch>
</PropertyGroup>
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.2' ">
<PackagesInPatch>
</PackagesInPatch>
</PropertyGroup>
</Project>

2
modules/EntityFrameworkCore

@ -1 +1 @@
Subproject commit 8e7402701ea1416b7fe55e1863ae65b3147c02c7
Subproject commit 536335387bb56f17621c7e4b4a1139bbbdd8f555

2
modules/Scaffolding

@ -1 +1 @@
Subproject commit a8a3c4d6bcef48a3dd464d03f629a0a18dbf3110
Subproject commit 8295c4b56c125d3f536020618a49c6a16017ca25

2
src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.1.txt Normal file
View File

@ -0,0 +1,2 @@
system.diagnostics.process\4.3.0\.signature.p7s
system.reflection.emit.ilgeneration\4.3.0\.signature.p7s

2
src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.1.txt Normal file
View File

@ -0,0 +1,2 @@
system.diagnostics.process\4.3.0\.signature.p7s
system.reflection.emit.ilgeneration\4.3.0\.signature.p7s

10
src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets
View File

@ -22,15 +22,17 @@
<TargetPath>$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg</TargetPath>
</PropertyGroup>
<Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)" Condition=" '$(IsPackable)' != 'false' ">
<Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)">
<ItemGroup>
<ArtifactInfo Include="$(TargetPath)">
<ArtifactType>NuGetPackage</ArtifactType>
<PackageId>$(PackageId)</PackageId>
<Version>$(PackageVersion)</Version>
<Certificate>$(PackageSigningCertName)</Certificate>
<ShouldBeSigned>true</ShouldBeSigned>
<Version Condition="'$(IsPackageInThisPatch)' == 'true'">$(PackageVersion)</Version>
<Version Condition="'$(IsPackageInThisPatch)' != 'true'">$(BaselinePackageVersion)</Version>
<Certificate>$(PackageSigningCertName)</Certificate>
<ShouldBeSigned>$(IsPackageInThisPatch)</ShouldBeSigned>
<IsContainer>true</IsContainer>
<IsShipped Condition="'$(IsPackageInThisPatch)' != 'true'">true</IsShipped>
</ArtifactInfo>
</ItemGroup>
</Target>

8
src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets
View File

@ -21,15 +21,17 @@
<TargetPath>$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg</TargetPath>
</PropertyGroup>
<Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)" Condition=" '$(IsPackable)' != 'false' ">
<Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)">
<ItemGroup>
<ArtifactInfo Include="$(TargetPath)">
<ArtifactType>NuGetPackage</ArtifactType>
<PackageId>$(PackageId)</PackageId>
<Version>$(PackageVersion)</Version>
<Version Condition="'$(IsPackageInThisPatch)' == 'true'">$(PackageVersion)</Version>
<Version Condition="'$(IsPackageInThisPatch)' != 'true'">$(BaselinePackageVersion)</Version>
<Certificate>$(PackageSigningCertName)</Certificate>
<ShouldBeSigned>true</ShouldBeSigned>
<ShouldBeSigned>$(IsPackageInThisPatch)</ShouldBeSigned>
<IsContainer>true</IsContainer>
<IsShipped Condition="'$(IsPackageInThisPatch)' != 'true'">true</IsShipped>
</ArtifactInfo>
</ItemGroup>
</Target>

2
src/Templating/version.props
View File

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<VersionPrefix>2.2.1</VersionPrefix>
<VersionPrefix>2.2.2</VersionPrefix>
<VersionSuffix>servicing</VersionSuffix>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND ('$(VersionSuffix)' == 'servicing' OR '$(VersionSuffix)' == 'rtm') ">$(VersionPrefix)</PackageVersion>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'servicing' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>

2
version.props
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>2</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>1</AspNetCorePatchVersion>
<AspNetCorePatchVersion>2</AspNetCorePatchVersion>
<PreReleaseLabel>servicing</PreReleaseLabel>
<PreReleaseBrandingLabel></PreReleaseBrandingLabel>
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">$([System.DateTime]::Now.ToString('yyMMdd'))-99</BuildNumber>