Skip to content

Update branding to 2.1.10 #8265

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 2 commits into from
Mar 7, 2019
Merged

Update branding to 2.1.10 #8265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
919de60
Update branding to 2.1.10
dougbu Mar 7, 2019
671bc9f
Fixup baseline
dougbu Mar 7, 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
4 changes: 2 additions & 2 deletions build/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- These package versions may be overridden or updated by automation. -->
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
<MicrosoftNETCoreAppPackageVersion>2.1.7</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.7</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.9</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.9</MicrosoftNETCoreDotNetAppHostPackageVersion>
</PropertyGroup>

<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
Expand Down
2 changes: 1 addition & 1 deletion eng/Baseline.Designer.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<AspNetCoreBaselineVersion>2.1.8</AspNetCoreBaselineVersion>
<AspNetCoreBaselineVersion>2.1.9</AspNetCoreBaselineVersion>
</PropertyGroup>
<!-- Package: dotnet-dev-certs-->
<PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
Expand Down
2 changes: 1 addition & 1 deletion eng/Baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.

-->
<Baseline Version="2.1.8">
<Baseline Version="2.1.9">
<Package Id="dotnet-dev-certs" Version="2.1.1" />
<Package Id="dotnet-sql-cache" Version="2.1.1" />
<Package Id="dotnet-user-secrets" Version="2.1.1" />
Expand Down
5 changes: 5 additions & 0 deletions eng/PatchConfig.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,9 @@ Later on, this will be checked using this condition:
<PackagesInPatch>
</PackagesInPatch>
</PropertyGroup>

<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.10' ">
<PackagesInPatch>
</PackagesInPatch>
</PropertyGroup>
</Project>
6 changes: 6 additions & 0 deletions src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.9.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
microsoft.netcore.targets\1.1.0\.signature.p7s
runtime.native.system.security.cryptography\4.0.0\.signature.p7s
system.composition.convention\1.0.31\.signature.p7s
system.composition.typedparts\1.0.31\.signature.p7s
system.globalization.extensions\4.0.1\.signature.p7s
system.threading.tasks.parallel\4.3.0\.signature.p7s
6 changes: 6 additions & 0 deletions src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.9.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
microsoft.netcore.targets\1.1.0\.signature.p7s
runtime.native.system.security.cryptography\4.0.0\.signature.p7s
system.composition.convention\1.0.31\.signature.p7s
system.composition.typedparts\1.0.31\.signature.p7s
system.globalization.extensions\4.0.1\.signature.p7s
system.threading.tasks.parallel\4.3.0\.signature.p7s
2 changes: 1 addition & 1 deletion version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>9</AspNetCorePatchVersion>
<AspNetCorePatchVersion>10</AspNetCorePatchVersion>
<PreReleaseLabel>servicing</PreReleaseLabel>
<PreReleaseBrandingLabel>Servicing</PreReleaseBrandingLabel>
<BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">t000</BuildNumber>
Expand Down