From 9f03b0acffd557a179b28a683c9016f94e500d66 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Sat, 8 Aug 2020 14:18:33 -0700
Subject: [PATCH] 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
---
Directory.Build.props | 4 ++--
eng/Baseline.Designer.props | 2 +-
eng/Baseline.xml | 4 ++--
eng/Version.Details.xml | 9 +++++----
eng/Versions.props | 5 +++--
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 53865f2cfb4..0f51f5d3110 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -84,10 +84,10 @@
<RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName>
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
- <!-- Produce targeting pack installers/packages once per major.minor except in extraordinary cases i.e. 3.1.3. -->
+ <!-- Produce targeting pack installers/packages once per major.minor except in extraordinary cases i.e. 3.1.8. -->
<IsTargetingPackBuilding Condition=" '$(DotNetBuildFromSource)' == 'true' ">false</IsTargetingPackBuilding>
<IsTargetingPackBuilding
- Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(AspNetCorePatchVersion)' != '0' ">false</IsTargetingPackBuilding>
+ Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(AspNetCorePatchVersion)' != '8' ">false</IsTargetingPackBuilding>
<IsTargetingPackBuilding Condition=" '$(IsTargetingPackBuilding)' == '' ">true</IsTargetingPackBuilding>
<!--
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index b80e51cdc83..6c72f1aa422 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- <AspNetCoreBaselineVersion>3.1.6</AspNetCoreBaselineVersion>
+ <AspNetCoreBaselineVersion>3.1.7</AspNetCoreBaselineVersion>
</PropertyGroup>
<!-- Package: AspNetCoreRuntime.3.0.x64-->
<PropertyGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.3.0.x64' ">
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index 650550d1791..f04e5b10342 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
Update this list when preparing for a new patch.
-->
-<Baseline Version="3.1.6">
+<Baseline Version="3.1.7">
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
<Package Id="dotnet-sql-cache" Version="3.1.6" />
@@ -87,4 +87,4 @@ Update this list when preparing for a new patch.
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.6" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.6" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.6" />
-</Baseline>
\ No newline at end of file
+</Baseline>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d3b822832f8..ba13e203422 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -381,6 +381,11 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
</Dependency>
+ <!-- !!! Pin this again once 3.1.8 is released. May need CoherentParentDependency="Microsoft.EntityFrameworkCore" after next extensions build. -->
+ <Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.1.0-rtm.19565.4">
+ <Uri>https://github.com/dotnet/Extensions</Uri>
+ <Sha>4e1be2fb546751c773968d7b40ff7f4b62887153</Sha>
+ </Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
@@ -402,10 +407,6 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
</Dependency>
- <Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.1.0-rtm.19565.4" Pinned="true">
- <Uri>https://github.com/aspnet/Extensions</Uri>
- <Sha>4e1be2fb546751c773968d7b40ff7f4b62887153</Sha>
- </Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
diff --git a/eng/Versions.props b/eng/Versions.props
index 4b4a752dc06..f0543e4a546 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,7 +8,7 @@
<PropertyGroup Label="Version settings">
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
- <AspNetCorePatchVersion>7</AspNetCorePatchVersion>
+ <AspNetCorePatchVersion>8</AspNetCorePatchVersion>
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
@@ -24,6 +24,7 @@
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
<!-- 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. -->
+ <!-- !!! Update to 3.1.8 once we have a new official build of dotnet/extensions. -->
<MicrosoftInternalExtensionsRefsPackageOverrideVersion>3.1.0</MicrosoftInternalExtensionsRefsPackageOverrideVersion>
<!-- Additional assembly attributes are already configured to include the source revision ID. -->
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
@@ -34,7 +35,7 @@
<!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. -->
<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>
<!-- Targeting packs do not produce patch versions in servicing builds. No API changes are allowed in patches. -->
- <TargetingPackVersionPrefix Condition="'$(IsTargetingPackBuilding)' != 'true'">$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).3</TargetingPackVersionPrefix>
+ <TargetingPackVersionPrefix Condition="'$(IsTargetingPackBuilding)' != 'true'">$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).8</TargetingPackVersionPrefix>
<ExperimentalVersionPrefix>0.3.$(AspNetCorePatchVersion)</ExperimentalVersionPrefix>
<!-- ANCM versioning is intentionally 10 + AspNetCoreMajorVersion because earlier versions of ANCM shipped as 8.x. -->
<AspNetCoreModuleVersionMajor>$([MSBuild]::Add(10, $(AspNetCoreMajorVersion)))</AspNetCoreModuleVersionMajor>
--
GitLab