Skip to content

Commit de43594

Browse files
dougbudougbu
authored
Update branding to 3.0.1 (#2392)
- aspnet/AspNetCore-Internal#3153 - no longer doing stable builds - opt out of most `$(IsServicingBuild)` features for now e.g. ignore package baselines - do not build or pack Microsoft.Internal.Extensions.Refs.csproj - do not reference anything from ref/ projects nits: - remove `$(RestoreSources)` settings - remove downlevel patches from PatchConfig.props - copy general comment from AspNetCore's ResolveReferences.targets - remove extra checks and whitespace from `Condition`s in ResolveReferences.targets
1 parent 6f84a4a commit de43594

File tree

4 files changed

+48
-42
lines changed

4 files changed

+48
-42
lines changed

‎eng/PatchConfig.props

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,15 @@ This file contains a list of the package IDs which are patching in a given relea
55
CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky.
66
When adding a new package, make sure the new line ends with a semicolon and starts with a space.
77
8-
Later on, this will be checked using this condition:
9-
8+
Directory.Build.props checks this property using the following condition:
109
<IsPackageInThisPatch>$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
1110
-->
1211
<Project>
1312
<PropertyGroup>
1413
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
1514
</PropertyGroup>
1615

17-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.2' ">
18-
<PackagesInPatch>
19-
Microsoft.Extensions.Logging.AzureAppServices
20-
</PackagesInPatch>
21-
</PropertyGroup>
22-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.4' ">
23-
<PackagesInPatch>
24-
Microsoft.Extensions.Configuration.Binder;
25-
Microsoft.Extensions.Configuration.EnvironmentVariables;
26-
Microsoft.Extensions.Configuration.KeyPerFile;
27-
</PackagesInPatch>
28-
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.5' ">
30-
<PackagesInPatch>
31-
Microsoft.Extensions.Diagnostics.HealthChecks;
32-
Microsoft.Extensions.Logging.AzureAppServices;
33-
Microsoft.Extensions.Caching.StackExchangeRedis;
34-
</PackagesInPatch>
35-
</PropertyGroup>
36-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.8' ">
16+
<PropertyGroup Condition=" '$(VersionPrefix)' == '3.0.1' ">
3717
<PackagesInPatch>
3818
</PackagesInPatch>
3919
</PropertyGroup>

‎eng/Versions.props

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<PropertyGroup Label="Version settings">
99
<MajorVersion>3</MajorVersion>
1010
<MinorVersion>0</MinorVersion>
11-
<PatchVersion>0</PatchVersion>
11+
<PatchVersion>1</PatchVersion>
1212
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
13-
<PreReleaseVersionLabel>rc2</PreReleaseVersionLabel>
13+
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1414
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' != 'true'">$(VersionPrefix).0</AssemblyVersion>
1515
<!--
1616
We do not support changing reference assemblies in a patch. This ignores
@@ -19,14 +19,21 @@
1919
-->
2020
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' == 'true'">$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
2121
<ExperimentalVersionPrefix>0.1.$(PatchVersion)</ExperimentalVersionPrefix>
22+
<!--
23+
Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them and PatchConfig.props. This also
24+
gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions.
25+
-->
26+
<DisableServicingFeatures
27+
Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>
2228
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
23-
<IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
29+
<IsServicingBuild
30+
Condition=" '$(DisableServicingFeatures)' != 'true' AND '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
2431
<!-- This is used for error checking to ensure generated code and baselines are up to date when we increment the patch. -->
2532
<PreviousExtensionsReleaseVersion Condition=" '$(PatchVersion)' != '0' ">$(MajorVersion).$(MinorVersion).$([MSBuild]::Subtract($(PatchVersion), 1))</PreviousExtensionsReleaseVersion>
2633
<!--
2734
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
2835
-->
29-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
36+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
3037
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
3138
</PropertyGroup>
3239
<PropertyGroup Label="Arcade settings">
@@ -102,14 +109,4 @@
102109
<SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion>
103110
<SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
104111
</PropertyGroup>
105-
<PropertyGroup Label="Restore sources">
106-
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
107-
$(RestoreSources);
108-
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
109-
</RestoreSources>
110-
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND $(MicrosoftNetCompilersToolsetVersion.Contains('-')) ">
111-
$(RestoreSources);
112-
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
113-
</RestoreSources>
114-
</PropertyGroup>
115112
</Project>

‎eng/targets/ResolveReferences.targets

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
1+
<!--
2+
3+
The targets in this file are used to implement custom <Reference> resolution.
4+
For more details, see /docs/ReferenceResolution.md.
5+
6+
Properties which can be set by projects. If unset, these will be inferred.
7+
8+
* UseLatestPackageReferences = resolve `<Reference>` items to the latest version of PackageReferences in eng/Dependencies.props.
9+
* UseProjectReferences = prefer project references to packages
10+
* IsProjectReferenceProvider = when true, the assembly in this project should be available as a ProjectReferenceProvider (see below).
11+
12+
Items used by the resolution strategy:
13+
14+
* BaselinePackageReference = a list of packages that were reference in the last release of the project currently building
15+
* LatestPackageReference = a list of the latest versions of packages
16+
* Reference = a list of the references which are needed for compilation or runtime
17+
* ProjectReferenceProvider = a list which maps of assembly names to the project file that produces it
18+
-->
119
<Project>
220

321
<PropertyGroup>
422
<EnableCustomReferenceResolution Condition="'$(EnableCustomReferenceResolution)' == '' AND ('$(DotNetBuildFromSource)' != 'true' OR '$(ExcludeFromSourceBuild)' != 'true')">true</EnableCustomReferenceResolution>
23+
524
<ResolveReferencesDependsOn>
625
ResolveCustomReferences;
726
$(ResolveReferencesDependsOn);
@@ -20,7 +39,8 @@
2039
-->
2140
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseLatestPackageReferences>
2241
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseLatestPackageReferences>
23-
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND ( '$(IsServicingBuild)' != 'true' OR '$(IsPackable)' == 'true' ) ">true</UseLatestPackageReferences>
42+
<UseLatestPackageReferences
43+
Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(IsPackable)' == 'true' ">true</UseLatestPackageReferences>
2444
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' ">false</UseLatestPackageReferences>
2545

2646
<!--
@@ -30,7 +50,7 @@
3050
3151
We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible.
3252
-->
33-
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>
53+
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>
3454
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseProjectReferences>
3555
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' ">false</UseProjectReferences>
3656

‎src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.0</TargetFramework>
5-
<IsPackable>true</IsPackable>
5+
6+
<!-- Do not pack in servicing builds. -->
7+
<IsPackable>false</IsPackable>
8+
<IsPackable Condition=" '$(PatchVersion)' == '0' ">true</IsPackable>
9+
610
<IsShipping>false</IsShipping>
711
<!-- This project is not included in the shared framework -->
812
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
@@ -23,15 +27,16 @@
2327
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
2428
<GenerateDependencyFile>false</GenerateDependencyFile>
2529

26-
<!-- This project should not be referenced via the `<Reference>` impementation. -->
30+
<!-- This project should not be referenced via the `<Reference>` implementation. -->
2731
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
2832

2933
<!-- Reference implementation assemblies in addition to ref assemblies to get xml docs -->
3034
<ReferenceImplementationAssemblies>true</ReferenceImplementationAssemblies>
3135
</PropertyGroup>
3236

3337
<ItemGroup>
34-
<Reference Include="@(ProjectReferenceProvider)" />
38+
<!-- Don't reference anything unless building a targeting pack. Otherwise will use ref and non-ref assemblies. -->
39+
<Reference Include="@(ProjectReferenceProvider)" Condition="$(IsPackable)" />
3540
</ItemGroup>
3641

3742
<ItemGroup>
@@ -43,12 +48,16 @@
4348
$(BuildDependsOn);
4449
_ResolveTargetingPackContent;
4550
</BuildDependsOn>
51+
52+
<!-- Suppresses building this project completely during servicing builds. -->
53+
<BuildDependsOn Condition="! $(IsPackable)" />
4654
</PropertyGroup>
4755

4856
<!-- Override the default MSBuild targets so that nothing is returned from the project since it represents a collection of assemblies. -->
4957
<Target Name="GetTargetPath" />
5058
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)">
51-
<Message Importance="High" Text="$(MSBuildProjectName) -> $(TargetDir)" />
59+
<Message Importance="High" Text="$(MSBuildProjectName) -> $(TargetDir)" Condition="$(IsPackable)" />
60+
<Message Importance="High" Text="$(MSBuildProjectName) not building" Condition="! $(IsPackable)" />
5261
</Target>
5362

5463
<!-- This project doesn't compile anything. -->

0 commit comments

Comments
 (0)