Skip to content

Update branding to 3.0.1 #2392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 27, 2019
Merged

Update branding to 3.0.1 #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b434be
Update branding to 3.0.1
dougbu Sep 24, 2019
d54976d
Ignore package baselines for now
dougbu Sep 25, 2019
0decf5f
Disable up-to-date check of package baselines
dougbu Sep 25, 2019
fef0e7e
Correct and centralize a couple of conditions
dougbu Sep 25, 2019
b770579
Further centralize choice to opt out of servicing features for now
dougbu Sep 25, 2019
a2777af
Do not build targeting pack
dougbu Sep 26, 2019
97c3e07
Do not reference anything from ref package in servicing builds
dougbu Sep 26, 2019
34947d7
!fixup! correct conditions in prior commit
dougbu Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 2 additions & 22 deletions eng/PatchConfig.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,15 @@ This file contains a list of the package IDs which are patching in a given relea
CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky.
When adding a new package, make sure the new line ends with a semicolon and starts with a space.

Later on, this will be checked using this condition:

Directory.Build.props checks this property using the following condition:
<IsPackageInThisPatch>$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
-->
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.2' ">
<PackagesInPatch>
Microsoft.Extensions.Logging.AzureAppServices
</PackagesInPatch>
</PropertyGroup>
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.4' ">
<PackagesInPatch>
Microsoft.Extensions.Configuration.Binder;
Microsoft.Extensions.Configuration.EnvironmentVariables;
Microsoft.Extensions.Configuration.KeyPerFile;
</PackagesInPatch>
</PropertyGroup>
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.5' ">
<PackagesInPatch>
Microsoft.Extensions.Diagnostics.HealthChecks;
Microsoft.Extensions.Logging.AzureAppServices;
Microsoft.Extensions.Caching.StackExchangeRedis;
</PackagesInPatch>
</PropertyGroup>
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.8' ">
<PropertyGroup Condition=" '$(VersionPrefix)' == '3.0.1' ">
<PackagesInPatch>
</PackagesInPatch>
</PropertyGroup>
Expand Down
25 changes: 11 additions & 14 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<PropertyGroup Label="Version settings">
<MajorVersion>3</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PatchVersion>1</PatchVersion>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<PreReleaseVersionLabel>rc2</PreReleaseVersionLabel>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' != 'true'">$(VersionPrefix).0</AssemblyVersion>
<!--
We do not support changing reference assemblies in a patch. This ignores
Expand All @@ -19,14 +19,21 @@
-->
<AssemblyVersion Condition="'$(IsReferenceAssemblyProject)' == 'true'">$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
<ExperimentalVersionPrefix>0.1.$(PatchVersion)</ExperimentalVersionPrefix>
<!--
Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them and PatchConfig.props. This also
gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions.
-->
<DisableServicingFeatures
Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
<IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
<IsServicingBuild
Condition=" '$(DisableServicingFeatures)' != 'true' AND '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
<!-- This is used for error checking to ensure generated code and baselines are up to date when we increment the patch. -->
<PreviousExtensionsReleaseVersion Condition=" '$(PatchVersion)' != '0' ">$(MajorVersion).$(MinorVersion).$([MSBuild]::Subtract($(PatchVersion), 1))</PreviousExtensionsReleaseVersion>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
</PropertyGroup>
<PropertyGroup Label="Arcade settings">
Expand Down Expand Up @@ -102,14 +109,4 @@
<SystemThreadingTasksExtensionsPackageVersion>4.5.2</SystemThreadingTasksExtensionsPackageVersion>
<SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
</PropertyGroup>
<PropertyGroup Label="Restore sources">
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
$(RestoreSources);
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND $(MicrosoftNetCompilersToolsetVersion.Contains('-')) ">
$(RestoreSources);
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
</RestoreSources>
</PropertyGroup>
</Project>
24 changes: 22 additions & 2 deletions eng/targets/ResolveReferences.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
<!--

The targets in this file are used to implement custom <Reference> resolution.
For more details, see /docs/ReferenceResolution.md.

Properties which can be set by projects. If unset, these will be inferred.

* UseLatestPackageReferences = resolve `<Reference>` items to the latest version of PackageReferences in eng/Dependencies.props.
* UseProjectReferences = prefer project references to packages
* IsProjectReferenceProvider = when true, the assembly in this project should be available as a ProjectReferenceProvider (see below).

Items used by the resolution strategy:

* BaselinePackageReference = a list of packages that were reference in the last release of the project currently building
* LatestPackageReference = a list of the latest versions of packages
* Reference = a list of the references which are needed for compilation or runtime
* ProjectReferenceProvider = a list which maps of assembly names to the project file that produces it
-->
<Project>

<PropertyGroup>
<EnableCustomReferenceResolution Condition="'$(EnableCustomReferenceResolution)' == '' AND ('$(DotNetBuildFromSource)' != 'true' OR '$(ExcludeFromSourceBuild)' != 'true')">true</EnableCustomReferenceResolution>

<ResolveReferencesDependsOn>
ResolveCustomReferences;
$(ResolveReferencesDependsOn);
Expand All @@ -20,7 +39,8 @@
-->
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseLatestPackageReferences>
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseLatestPackageReferences>
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND ( '$(IsServicingBuild)' != 'true' OR '$(IsPackable)' == 'true' ) ">true</UseLatestPackageReferences>
<UseLatestPackageReferences
Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(IsPackable)' == 'true' ">true</UseLatestPackageReferences>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to dotnet/aspnetcore#14404, the changes in this file are all about nits. The change here is again about the redundancy of checking '$(IsServicingBuild)' != 'true' twice.

<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' ">false</UseLatestPackageReferences>

<!--
Expand All @@ -30,7 +50,7 @@

We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible.
-->
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseProjectReferences>
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' ">false</UseProjectReferences>

Expand Down
17 changes: 13 additions & 4 deletions ...tingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<IsPackable>true</IsPackable>

<!-- Do not pack in servicing builds. -->
<IsPackable>false</IsPackable>
<IsPackable Condition=" '$(PatchVersion)' == '0' ">true</IsPackable>

<IsShipping>false</IsShipping>
<!-- This project is not included in the shared framework -->
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
Expand All @@ -23,15 +27,16 @@
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
<GenerateDependencyFile>false</GenerateDependencyFile>

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

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

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

<ItemGroup>
Expand All @@ -43,12 +48,16 @@
$(BuildDependsOn);
_ResolveTargetingPackContent;
</BuildDependsOn>

<!-- Suppresses building this project completely during servicing builds. -->
<BuildDependsOn Condition="! $(IsPackable)" />
</PropertyGroup>

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

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