Skip to content

Commit

Permalink
Update branding to 3.1.8
Browse files Browse the repository at this point in the history
- build targeting pack to pick up NuGet/Home#8599 fix
    - #2750 and dotnet/aspnetcore#24200 1/2
    - suppress MSB3243 warnings because ref/ and src/ assemblies have different versions
- fake the baseline update
    - remainder must be done after the 3.1.7 release
  • Loading branch information
dougbu committed Aug 11, 2020
1 parent 72a786b commit 6087bc7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion eng/Baseline.Designer.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<ExtensionsBaselineVersion>3.1.6</ExtensionsBaselineVersion>
<ExtensionsBaselineVersion>3.1.7</ExtensionsBaselineVersion>
</PropertyGroup>
<!-- Package: Microsoft.Extensions.Caching.Abstractions-->
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Caching.Abstractions' ">
Expand Down
4 changes: 2 additions & 2 deletions eng/Baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
build of Extensions. Update this list when preparing for a new patch.
-->
<Baseline Version="3.1.6">
<Baseline Version="3.1.7">
<Package Id="Microsoft.Extensions.Caching.Abstractions" Version="3.1.6" />
<Package Id="Microsoft.Extensions.Caching.Memory" Version="3.1.6" />
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="3.1.6" />
Expand Down Expand Up @@ -57,4 +57,4 @@ build of Extensions. Update this list when preparing for a new patch.
<Package Id="Microsoft.Extensions.Primitives" Version="3.1.6" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="3.1.6" />
<Package Id="Microsoft.JSInterop" Version="3.1.6" />
</Baseline>
</Baseline>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PropertyGroup Label="Version settings">
<MajorVersion>3</MajorVersion>
<MinorVersion>1</MinorVersion>
<PatchVersion>7</PatchVersion>
<PatchVersion>8</PatchVersion>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' != 'true'">$(VersionPrefix).0</AssemblyVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>

<!-- Do not pack in servicing builds. -->
<!-- Do not pack in servicing builds except in special circumstances e.g. 3.1.8. -->
<IsPackable>false</IsPackable>
<IsPackable Condition=" '$(PatchVersion)' == '0' ">true</IsPackable>
<IsPackable Condition=" '$(PatchVersion)' == '0' OR '$(PatchVersion)' == '8' ">true</IsPackable>
<IsShipping>false</IsShipping>
<!-- This project is not included in the shared framework -->
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
Expand All @@ -31,6 +31,12 @@

<!-- Reference implementation assemblies in addition to ref assemblies to get xml docs -->
<ReferenceImplementationAssemblies>true</ReferenceImplementationAssemblies>

<!--
We are ignoring MSB3243 warnings since implementation and reference assemblies are versioned differently.
We need both to compose the targeting pack with reference assemblies and xml docs.
-->
<MSBuildWarningsAsMessages>MSB3243</MSBuildWarningsAsMessages>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 6087bc7

Please sign in to comment.