Skip to content

Commit 9f03b0a

Browse files
committed
Update branding to 3.1.8
- build targeting pack to pick up NuGet/Home#8599 fix - dotnet/extensions#2750 and #24200 2/2 - requires follow-up after next official extensions build - fake the baseline update - remainder must be done after the 3.1.7 release
1 parent 1bf292d commit 9f03b0a

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@
8484
<RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName>
8585
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
8686

87-
<!-- Produce targeting pack installers/packages once per major.minor except in extraordinary cases i.e. 3.1.3. -->
87+
<!-- Produce targeting pack installers/packages once per major.minor except in extraordinary cases i.e. 3.1.8. -->
8888
<IsTargetingPackBuilding Condition=" '$(DotNetBuildFromSource)' == 'true' ">false</IsTargetingPackBuilding>
8989
<IsTargetingPackBuilding
90-
Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(AspNetCorePatchVersion)' != '0' ">false</IsTargetingPackBuilding>
90+
Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(AspNetCorePatchVersion)' != '8' ">false</IsTargetingPackBuilding>
9191
<IsTargetingPackBuilding Condition=" '$(IsTargetingPackBuilding)' == '' ">true</IsTargetingPackBuilding>
9292

9393
<!--

eng/Baseline.Designer.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5-
<AspNetCoreBaselineVersion>3.1.6</AspNetCoreBaselineVersion>
5+
<AspNetCoreBaselineVersion>3.1.7</AspNetCoreBaselineVersion>
66
</PropertyGroup>
77
<!-- Package: AspNetCoreRuntime.3.0.x64-->
88
<PropertyGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.3.0.x64' ">

eng/Baseline.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
44
Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="3.1.6">
7+
<Baseline Version="3.1.7">
88
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
99
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
1010
<Package Id="dotnet-sql-cache" Version="3.1.6" />
@@ -87,4 +87,4 @@ Update this list when preparing for a new patch.
8787
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.6" />
8888
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.6" />
8989
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.6" />
90-
</Baseline>
90+
</Baseline>

eng/Version.Details.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,11 @@
381381
<Uri>https://github.com/dotnet/core-setup</Uri>
382382
<Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
383383
</Dependency>
384+
<!-- !!! Pin this again once 3.1.8 is released. May need CoherentParentDependency="Microsoft.EntityFrameworkCore" after next extensions build. -->
385+
<Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.1.0-rtm.19565.4">
386+
<Uri>https://github.com/dotnet/Extensions</Uri>
387+
<Sha>4e1be2fb546751c773968d7b40ff7f4b62887153</Sha>
388+
</Dependency>
384389
<!--
385390
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
386391
All Runtime.$rid packages should have the same version.
@@ -402,10 +407,6 @@
402407
<Uri>https://github.com/dotnet/core-setup</Uri>
403408
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
404409
</Dependency>
405-
<Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.1.0-rtm.19565.4" Pinned="true">
406-
<Uri>https://github.com/aspnet/Extensions</Uri>
407-
<Sha>4e1be2fb546751c773968d7b40ff7f4b62887153</Sha>
408-
</Dependency>
409410
</ProductDependencies>
410411
<ToolsetDependencies>
411412
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->

eng/Versions.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PropertyGroup Label="Version settings">
99
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
11-
<AspNetCorePatchVersion>7</AspNetCorePatchVersion>
11+
<AspNetCorePatchVersion>8</AspNetCorePatchVersion>
1212
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
1313
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
1414
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
@@ -24,6 +24,7 @@
2424
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
2525
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
2626
<!-- The following property may need to be updated if ingesting new versions of Extensions.Refs package. The package override version is used to create PackageOverrides.txt in the targeting pack. -->
27+
<!-- !!! Update to 3.1.8 once we have a new official build of dotnet/extensions. -->
2728
<MicrosoftInternalExtensionsRefsPackageOverrideVersion>3.1.0</MicrosoftInternalExtensionsRefsPackageOverrideVersion>
2829
<!-- Additional assembly attributes are already configured to include the source revision ID. -->
2930
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
@@ -34,7 +35,7 @@
3435
<!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. -->
3536
<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>
3637
<!-- Targeting packs do not produce patch versions in servicing builds. No API changes are allowed in patches. -->
37-
<TargetingPackVersionPrefix Condition="'$(IsTargetingPackBuilding)' != 'true'">$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).3</TargetingPackVersionPrefix>
38+
<TargetingPackVersionPrefix Condition="'$(IsTargetingPackBuilding)' != 'true'">$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).8</TargetingPackVersionPrefix>
3839
<ExperimentalVersionPrefix>0.3.$(AspNetCorePatchVersion)</ExperimentalVersionPrefix>
3940
<!-- ANCM versioning is intentionally 10 + AspNetCoreMajorVersion because earlier versions of ANCM shipped as 8.x. -->
4041
<AspNetCoreModuleVersionMajor>$([MSBuild]::Add(10, $(AspNetCoreMajorVersion)))</AspNetCoreModuleVersionMajor>

0 commit comments

Comments
 (0)