Skip to content

Commit 63ee551

Browse files
dougbudougbu
committed
Merge release/2.2 to master 
2 parents 0b1097a + 970bced commit 63ee551

File tree

5 files changed

+24
-28
lines changed

5 files changed

+24
-28
lines changed

‎build/repo.targets

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,6 @@
113113
<Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
114114
</MSBuild>
115115

116-
<MSBuild Projects="@(ProjectToBuild)"
117-
Targets="GetArtifactInfo"
118-
Properties="$(DesignTimeBuildProps);Configuration=$(Configuration);VersionSuffix=$(VersionSuffix);BuildNumberSuffix=$(BuildNumberSuffix);DesignTimeBuild=true"
119-
SkipNonexistentTargets="true"
120-
BuildInParallel="true">
121-
<Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
122-
</MSBuild>
123-
124116
<MSBuild Projects="@(_RepositoryProject)"
125117
Targets="ResolveSolutions"
126118
Properties="$(DesignTimeBuildProps);Configuration=$(Configuration);VersionSuffix=$(VersionSuffix);BuildNumberSuffix=$(BuildNumberSuffix)"

‎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, )" />
@@ -941,7 +941,7 @@
941941
</ItemGroup>
942942
<!-- Package: Microsoft.AspNetCore.Server.IIS-->
943943
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IIS' ">
944-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
944+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
945945
</PropertyGroup>
946946
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IIS' AND '$(TargetFramework)' == 'netstandard2.0' ">
947947
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
@@ -952,7 +952,7 @@
952952
</ItemGroup>
953953
<!-- Package: Microsoft.AspNetCore.Server.IISIntegration-->
954954
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' ">
955-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
955+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
956956
</PropertyGroup>
957957
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.IISIntegration' AND '$(TargetFramework)' == 'netstandard2.0' ">
958958
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
@@ -1035,16 +1035,16 @@
10351035
</ItemGroup>
10361036
<!-- Package: Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets-->
10371037
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets' ">
1038-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
1038+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
10391039
</PropertyGroup>
10401040
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
1041-
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
10421041
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
1042+
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
10431043
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
10441044
</ItemGroup>
10451045
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets' AND '$(TargetFramework)' == 'netstandard2.0' ">
1046-
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
10471046
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.2.0, )" />
1047+
<BaselinePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="[2.2.0, )" />
10481048
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
10491049
</ItemGroup>
10501050
<!-- Package: Microsoft.AspNetCore.Server.Kestrel-->
@@ -1218,13 +1218,13 @@
12181218
</ItemGroup>
12191219
<!-- Package: Microsoft.AspNetCore.WebSockets-->
12201220
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebSockets' ">
1221-
<BaselinePackageVersion>2.2.0</BaselinePackageVersion>
1221+
<BaselinePackageVersion>2.2.1</BaselinePackageVersion>
12221222
</PropertyGroup>
12231223
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.WebSockets' AND '$(TargetFramework)' == 'netstandard2.0' ">
12241224
<BaselinePackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="[2.2.0, )" />
12251225
<BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[2.2.0, )" />
12261226
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
1227-
<BaselinePackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="[4.5.1, )" />
1227+
<BaselinePackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="[4.5.3, )" />
12281228
</ItemGroup>
12291229
<!-- Package: Microsoft.AspNetCore.WebUtilities-->
12301230
<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" />
@@ -101,13 +101,13 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
101101
<Package Id="Microsoft.AspNetCore.Routing.Abstractions" Version="2.2.0" />
102102
<Package Id="Microsoft.AspNetCore.Routing" Version="2.2.0" />
103103
<Package Id="Microsoft.AspNetCore.Server.HttpSys" Version="2.2.0" />
104-
<Package Id="Microsoft.AspNetCore.Server.IIS" Version="2.2.0" />
105-
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.0" />
104+
<Package Id="Microsoft.AspNetCore.Server.IIS" Version="2.2.1" />
105+
<Package Id="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
106106
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.2.0" />
107107
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
108108
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.2.0" />
109109
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.2.0" />
110-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.0" />
110+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.2.1" />
111111
<Package Id="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
112112
<Package Id="Microsoft.AspNetCore.Session" Version="2.2.0" />
113113
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="1.1.0" />
@@ -124,7 +124,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
124124
<Package Id="Microsoft.AspNetCore.SpaServices" Version="2.2.0" />
125125
<Package Id="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
126126
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
127-
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.0" />
127+
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
128128
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
129129
<Package Id="Microsoft.AspNetCore" Version="2.2.0" />
130130
<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
@@ -17,5 +17,9 @@ Later on, this will be checked using this condition:
1717
<PackagesInPatch>
1818
</PackagesInPatch>
1919
</PropertyGroup>
20+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.2' ">
21+
<PackagesInPatch>
22+
</PackagesInPatch>
23+
</PropertyGroup>
2024

2125
</Project>

‎src/Templating/version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<Project>
1+
<Project>
22
<Import Project="..\..\version.props" />
33
</Project>

0 commit comments

Comments
 (0)