huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update assembly versions when servicing (#24952) 

- #24540

nit: Fix a comment typo
This commit is contained in:
Doug Bunting 2020-09-16 09:58:08 -07:00 committed by GitHub
parent 70bc346d25
commit 06d672f2ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Directory.Build.targets
View File

@ -132,8 +132,14 @@
<None Include="$(PackageThirdPartyNoticesFile)" Pack="true" PackagePath="." /> <None Include="$(PackageThirdPartyNoticesFile)" Pack="true" PackagePath="." />
</ItemGroup> </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>
<PropertyGroup> <PropertyGroup>

2
eng/targets/ResolveReferences.targets
View File

@ -47,7 +47,7 @@
Projects should only use the project references instead of baseline package references when: 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) * preparing a new major or minor release (i.e. a non-servicing builds)
* when a project is a test or sample project * 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 <UseProjectReferences
Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences> Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>