Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Commit

Permalink
Merge in 'release/2.1.6xx' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Oct 10, 2019
2 parents 971034d + f769321 commit cad4fbe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build/MSBuildExtensions.targets
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@
</ItemGroup>

<PropertyGroup>
<MicrosoftNETCoreAppLatestVersion1_0 Condition="'$(MicrosoftNETCoreAppLatestVersion1_0)' == ''">1.0.15</MicrosoftNETCoreAppLatestVersion1_0>
<MicrosoftNETCoreAppLatestVersion1_1 Condition="'$(MicrosoftNETCoreAppLatestVersion1_1)' == ''">1.1.12</MicrosoftNETCoreAppLatestVersion1_1>
<MicrosoftNETCoreAppLatestVersion1_0 Condition="'$(MicrosoftNETCoreAppLatestVersion1_0)' == ''">1.0.16</MicrosoftNETCoreAppLatestVersion1_0>
<MicrosoftNETCoreAppLatestVersion1_1 Condition="'$(MicrosoftNETCoreAppLatestVersion1_1)' == ''">1.1.13</MicrosoftNETCoreAppLatestVersion1_1>
<MicrosoftNETCoreAppLatestVersion2_0 Condition="'$(MicrosoftNETCoreAppLatestVersion2_0)' == ''">2.0.9</MicrosoftNETCoreAppLatestVersion2_0>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion build/Signing.proj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- The signing infrastructure runs using MSBuild 14, which doesn't support some of the new syntax we're using. So set the BuildingSingingProject
property here to avoid importing files we don't need for signing which would cause errors if imported when using MSBuild 14. -->
<BuildingSigningProject>true</BuildingSigningProject>
<ExternalCertificateId Condition="'$(ExternalCertificateId)' == ''">135020001</ExternalCertificateId>
<ExternalCertificateId Condition="'$(ExternalCertificateId)' == ''">135020002</ExternalCertificateId>
<InternalCertificateId Condition="'$(InternalCertificateId)' == ''">Microsoft402</InternalCertificateId>
<NugetCertificateId Condition="'$(NugetCertificateId)' == ''">NuGet</NugetCertificateId>
</PropertyGroup>
Expand Down

0 comments on commit cad4fbe

Please sign in to comment.