Skip to content

Commit 970bced

Browse files
dougbudougbu
authored
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
1 parent 089912c commit 970bced

File tree

13 files changed

+45
-41
lines changed

13 files changed

+45
-41
lines changed

‎build/dependencies.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
<!-- These package versions may be overridden or updated by automation. -->
33
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
44
<!-- MicrosoftNETCoreApp22PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
5-
<MicrosoftNETCoreAppPackageVersion>2.2.0</MicrosoftNETCoreAppPackageVersion>
6-
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.0</MicrosoftNETCoreDotNetAppHostPackageVersion>
7-
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.2</SystemNetWebSocketsWebSocketProtocolPackageVersion>
5+
<MicrosoftNETCoreAppPackageVersion>2.2.1</MicrosoftNETCoreAppPackageVersion>
6+
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.1</MicrosoftNETCoreDotNetAppHostPackageVersion>
87
</PropertyGroup>
98

109
<PropertyGroup>
@@ -254,6 +253,7 @@
254253
<SystemThreadingTasksDataflowPackageVersion>4.9.0</SystemThreadingTasksDataflowPackageVersion>
255254
<SystemThreadingTasksExtensionsPackageVersion>4.5.1</SystemThreadingTasksExtensionsPackageVersion>
256255
<SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
256+
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.3</SystemNetWebSocketsWebSocketProtocolPackageVersion>
257257
<Utf8JsonPackageVersion>1.3.7</Utf8JsonPackageVersion>
258258
<VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
259259
<VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCommonPackageVersion>

‎build/repo.targets

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,6 @@
9696
<Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
9797
</MSBuild>
9898

99-
<MSBuild Projects="@(ProjectToBuild)"
100-
Targets="GetArtifactInfo"
101-
Properties="$(DesignTimeBuildProps);Configuration=$(Configuration);BuildNumber=$(BuildNumber);DesignTimeBuild=true"
102-
SkipNonexistentTargets="true"
103-
BuildInParallel="true">
104-
<Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
105-
</MSBuild>
106-
10799
<MSBuild Projects="@(_RepositoryProject)"
108100
Targets="ResolveSolutions"
109101
Properties="$(DesignTimeBuildProps);Configuration=$(Configuration);BuildNumber=$(BuildNumber)"

‎eng/Baseline.Designer.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5-
<AspNetCoreBaselineVersion>2.2.0</AspNetCoreBaselineVersion>
5+
<AspNetCoreBaselineVersion>2.2.1</AspNetCoreBaselineVersion>
66
</PropertyGroup>
77
<!-- Package: dotnet-dev-certs-->
88
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@@ -77,11 +77,11 @@
7777
</ItemGroup>
7878
<!-- Package: Microsoft.AspNetCore.AspNetCoreModule-->
7979
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' ">
80-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
80+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
8181
</PropertyGroup>
8282
<!-- Package: Microsoft.AspNetCore.AspNetCoreModuleV2-->
8383
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' ">
84-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
84+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
8585
</PropertyGroup>
8686
<!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
8787
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Abstractions' ">
@@ -361,7 +361,7 @@
361361
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' " />
362362
<!-- Package: Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore-->
363363
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' ">
364-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
364+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
365365
</PropertyGroup>
366366
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' AND '$(TargetFramework)' == 'netstandard2.0' ">
367367
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="[2.2.0, )" />
@@ -951,7 +951,7 @@
951951
</ItemGroup>
952952
<!-- Package: Microsoft.AspNetCore.Server.IIS-->
953953
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IIS' ">
954-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
954+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
955955
</PropertyGroup>
956956
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IIS' AND '$(TargetFramework)' == 'netstandard2.0' ">
957957
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
@@ -962,7 +962,7 @@
962962
</ItemGroup>
963963
<!-- Package: Microsoft.AspNetCore.Server.IISIntegration-->
964964
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' ">
965-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
965+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
966966
</PropertyGroup>
967967
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' AND '$(TargetFramework)' == 'netstandard2.0' ">
968968
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
@@ -1045,16 +1045,16 @@
10451045
</ItemGroup>
10461046
<!-- Package: Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets-->
10471047
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets' ">
1048-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
1048+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
10491049
</PropertyGroup>
10501050
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
1051-
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
10521051
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
1052+
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
10531053
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
10541054
</ItemGroup>
10551055
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets' AND '$(TargetFramework)' == 'netstandard2.0' ">
1056-
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
10571056
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
1057+
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
10581058
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
10591059
</ItemGroup>
10601060
<!-- Package: Microsoft.AspNetCore.Server.Kestrel-->
@@ -1228,13 +1228,13 @@
12281228
</ItemGroup>
12291229
<!-- Package: Microsoft.AspNetCore.WebSockets-->
12301230
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebSockets' ">
1231-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
1231+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
12321232
</PropertyGroup>
12331233
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebSockets' AND '$(TargetFramework)' == 'netstandard2.0' ">
12341234
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
12351235
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
12361236
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
1237-
<BaselinePackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="[4.5.1, )" />
1237+
<BaselinePackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="[4.5.3, )" />
12381238
</ItemGroup>
12391239
<!-- Package: Microsoft.AspNetCore.WebUtilities-->
12401240
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebUtilities' ">

‎eng/Baseline.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ This file contains a list of all the packages and their versions which were rele
44
build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="2.2.0">
7+
<Baseline Version="2.2.1">
88
<Package Id="dotnet-dev-certs" Version="2.2.0" />
99
<Package Id="dotnet-sql-cache" Version="2.2.0" />
1010
<Package Id="dotnet-user-secrets" Version="2.2.0" />
1111
<Package Id="dotnet-watch" Version="2.2.0" />
1212
<Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
1313
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="2.2.0-preview-35687" />
1414
<Package Id="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
15-
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.0" />
16-
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.0" />
15+
<Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.1" />
16+
<Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.1" />
1717
<Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
1818
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" />
1919
<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.
4646
<Package Id="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.2.0" />
4747
<Package Id="Microsoft.AspNetCore.DataProtection" Version="2.2.0" />
4848
<Package Id="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.2.0" />
49-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.2.0" />
49+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.2.1" />
5050
<Package Id="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
5151
<Package Id="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
5252
<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.
102102
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />
103103
<Package Id="Microsoft.AspNetCore.Routing" Version="2.2.0" />
104104
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.2.0" />
105-
<Package Id="Microsoft.AspNetCore.Server.IIS" Version="2.2.0" />
106-
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.0" />
105+
<Package Id="Microsoft.AspNetCore.Server.IIS" Version="2.2.1" />
106+
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
107107
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.2.0" />
108108
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
109109
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.2.0" />
110110
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.2.0" />
111-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.0" />
111+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.1" />
112112
<Package Id="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
113113
<Package Id="Microsoft.AspNetCore.Session" Version="2.2.0" />
114114
<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.
125125
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.2.0" />
126126
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
127127
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
128-
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.0" />
128+
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
129129
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
130130
<Package Id="Microsoft.AspNetCore" Version="2.2.0" />
131131
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.2.0" />

‎eng/PatchConfig.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,9 @@ Later on, this will be checked using this condition:
2525
Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
2626
</PackagesInPatch>
2727
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.2' ">
29+
<PackagesInPatch>
30+
</PackagesInPatch>
31+
</PropertyGroup>
2832

2933
</Project>

‎modules/EntityFrameworkCore

‎modules/Scaffolding

‎src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.1.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
system.diagnostics.process\4.3.0\.signature.p7s
2+
system.reflection.emit.ilgeneration\4.3.0\.signature.p7s

‎src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.1.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
system.diagnostics.process\4.3.0\.signature.p7s
2+
system.reflection.emit.ilgeneration\4.3.0\.signature.p7s

‎src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,17 @@
2222
<TargetPath>$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg</TargetPath>
2323
</PropertyGroup>
2424

25-
<Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)" Condition=" '$(IsPackable)' != 'false' ">
25+
<Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)">
2626
<ItemGroup>
2727
<ArtifactInfo Include="$(TargetPath)">
2828
<ArtifactType>NuGetPackage</ArtifactType>
2929
<PackageId>$(PackageId)</PackageId>
30-
<Version>$(PackageVersion)</Version>
31-
<Certificate>$(PackageSigningCertName)</Certificate>
32-
<ShouldBeSigned>true</ShouldBeSigned>
30+
<Version Condition="'$(IsPackageInThisPatch)' == 'true'">$(PackageVersion)</Version>
31+
<Version Condition="'$(IsPackageInThisPatch)' != 'true'">$(BaselinePackageVersion)</Version>
32+
<Certificate>$(PackageSigningCertName)</Certificate>
33+
<ShouldBeSigned>$(IsPackageInThisPatch)</ShouldBeSigned>
3334
<IsContainer>true</IsContainer>
35+
<IsShipped Condition="'$(IsPackageInThisPatch)' != 'true'">true</IsShipped>
3436
</ArtifactInfo>
3537
</ItemGroup>
3638
</Target>

0 commit comments

Comments
 (0)