From 06d672f2ca11486ce08d7058c1e574bda7e4bbfb Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 16 Sep 2020 09:58:08 -0700
Subject: [PATCH] Update assembly versions when servicing (#24952)

- #24540

nit: Fix a comment typo
---
 Directory.Build.targets               | 10 ++++++++--
 eng/targets/ResolveReferences.targets |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 96c4576add..7a13e8860e 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -132,8 +132,14 @@
     <None Include="$(PackageThirdPartyNoticesFile)" Pack="true" PackagePath="." />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(Language)' == 'C#'">
-    <AssemblyVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0</AssemblyVersion>
+  <!--
+    If assembly is in shared framework and not net4*, assembly version should remain fixed for an entire
+    major.minor release even in servicing.
+  -->
+  <PropertyGroup Condition=" '$(IsAspNetCoreApp)' == 'true' AND
+      '$(Language)' == 'C#' AND
+      '$(TargetFrameworkIdentifier)' != '.NETFramework' ">
+    <AssemblyVersion>$(AspNetCoreMajorMinorVersion).0.0</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index 092d7aec67..df5b0eaa86 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -47,7 +47,7 @@
       Projects should only use the project references instead of baseline package references when:
         * preparing a new major or minor release (i.e. a non-servicing builds)
         * when a project is a test or sample project
-      We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible.
+      We don't use project references between components in servicing builds between components to preserve the baseline as much as possible.
     -->
     <UseProjectReferences
         Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>