Update assembly versions when servicing (dotnet#24952)

- dotnet#24540 nit: Fix a comment typo
v-chayan · Sep 16, 2020 · 06d672f · 06d672f
1 parent 70bc346
commit 06d672f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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>