Skip to content

Commit f805ba3

Browse files
authored
Update branding to 2.1.27 (#30474)
* Update branding to 2.1.27 and change baseline resolution * Actually update branding * Set BuildArgs * Fix arg * Fixup * Change var * Don't run VerifyBuildOutputs if package isn't in patch * See if not using project references fixes tests * Undo some changes * Undo more changes * Skip validation * Update sources.props * Update Baseline.xml * Update Baseline.xml * Update Baseline.Designer.props * Newlines
1 parent a401d81 commit f805ba3

File tree

6 files changed

+13
-3
lines changed

6 files changed

+13
-3
lines changed

eng/PatchConfig.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,8 @@ Later on, this will be checked using this condition:
9494
@aspnet/signalr-protocol-msgpack;
9595
</PackagesInPatch>
9696
</PropertyGroup>
97+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.27' ">
98+
<PackagesInPatch>
99+
</PackagesInPatch>
100+
</PropertyGroup>
97101
</Project>

eng/targets/Packaging.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<Target Name="EnsureBaselineIsUpdated"
4-
Condition="'$(IsServicingBuild)' == 'true' AND '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)'"
4+
Condition="'$(ValidateBaseline)' == 'true' AND '$(IsServicingBuild)' == 'true' AND '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)'"
55
BeforeTargets="BeforeBuild">
66
<Error Text="The package baseline ($(AspNetCoreBaselineVersion)) is out of date with the latest release of this repo ($(PreviousAspNetCoreReleaseVersion)).
77
See $(RepositoryRoot)eng\tools\BaselineGenerator\README.md for instructions on updating this baseline." />

src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<RazorCompile Include="$(GeneratedInternalAspNetCoreAttributeFile)" />
5050
</ItemGroup>
5151

52-
<Target Name="VerifyBuildOutputs" AfterTargets="Build">
52+
<Target Name="VerifyBuildOutputs" AfterTargets="Build" Condition="'$(IsPackageInThisPatch)' == 'true'">
5353
<PropertyGroup>
5454
<ExpectedOutputFile>$(OutputPath)$(RazorTargetName).dll</ExpectedOutputFile>
5555
</PropertyGroup>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
2+
runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s
2+
runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\4.3.0\.signature.p7s

version.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<PropertyGroup>
33
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
44
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
5-
<AspNetCorePatchVersion>26</AspNetCorePatchVersion>
5+
<AspNetCorePatchVersion>27</AspNetCorePatchVersion>
6+
<ValidateBaseline>false</ValidateBaseline>
7+
68
<PreReleaseLabel>servicing</PreReleaseLabel>
79
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
810
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>

0 commit comments

Comments
 (0)