Skip to content

Commit 3184957

Browse files
dotnet-maestro-botnatemcmaster
authored andcommitted
Upgrade to .NET Core 2.1.6-servicing-27017-02
1 parent faa071b commit 3184957

File tree

4 files changed

+29
-23
lines changed

4 files changed

+29
-23
lines changed

build/dependencies.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<!-- These package versions may be overridden or updated by automation. -->
33
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
44
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
5-
<MicrosoftNETCoreAppPackageVersion>2.1.5</MicrosoftNETCoreAppPackageVersion>
6-
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.5</MicrosoftNETCoreDotNetAppHostPackageVersion>
5+
<MicrosoftNETCoreAppPackageVersion>2.1.6-servicing-27017-02</MicrosoftNETCoreAppPackageVersion>
6+
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.6-servicing-27017-02</MicrosoftNETCoreDotNetAppHostPackageVersion>
77
</PropertyGroup>
88

99
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />

build/repo.props

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,6 @@
4242
<SharedFrameworkName Include="Microsoft.AspNetCore.App" />
4343
</ItemGroup>
4444

45-
<ItemGroup>
46-
<!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by ASP.NET Core -->
47-
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" Condition="'$(SharedFXRid)' != 'linux-musl-x64'" />
48-
49-
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)"
50-
Feed="$(DotNetAssetRootUrl)"
51-
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
52-
53-
<DotNetCoreRuntime Condition="'$(OS)' == 'Windows_NT'"
54-
Include="$(MicrosoftNETCoreApp21PackageVersion)"
55-
Arch="x86"
56-
Feed="$(DotNetAssetRootUrl)"
57-
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
58-
59-
<!--
60-
The build doesn't support compiling the shared runtime on one machine along with running tests,
61-
so this is enables installing the shared runtime from a previous build.
62-
-->
63-
<AspNetCoreRuntime Include="$(PackageVersion)" Feed="$(AspNetCoreFxFeed)" Condition="'$(InstallSharedRuntimeFromPreviousBuild)' == 'true'" />
64-
</ItemGroup>
65-
6645
<!-- Properties for publishing -->
6746
<PropertyGroup>
6847
<!-- myget = non-orchestrated builds -->
@@ -74,6 +53,7 @@
7453
<PublishToTransportFeed Condition="$(PublishType.Contains('blob'))">true</PublishToTransportFeed>
7554
</PropertyGroup>
7655

56+
<Import Project="runtimes.props" />
7757
<Import Project="sources.props" />
7858
<Import Project="external-dependencies.props" />
7959
<Import Project="artifacts.props" />

build/runtimes.props

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project>
2+
3+
<ItemGroup>
4+
<!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by ASP.NET Core -->
5+
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" Condition="'$(SharedFXRid)' != 'linux-musl-x64'" />
6+
7+
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)"
8+
Feed="$(DotNetAssetRootUrl)"
9+
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
10+
11+
<DotNetCoreRuntime Condition="'$(OS)' == 'Windows_NT'"
12+
Include="$(MicrosoftNETCoreApp21PackageVersion)"
13+
Arch="x86"
14+
Feed="$(DotNetAssetRootUrl)"
15+
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
16+
17+
<!--
18+
The build doesn't support compiling the shared runtime on one machine along with running tests,
19+
so this is enables installing the shared runtime from a previous build.
20+
-->
21+
<AspNetCoreRuntime Include="$(PackageVersion)" Feed="$(AspNetCoreFxFeed)" Condition="'$(InstallSharedRuntimeFromPreviousBuild)' == 'true'" />
22+
</ItemGroup>
23+
24+
</Project>

src/DataProtection/build/repo.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<Project>
2+
<Import Project="..\..\..\build\dependencies.props" />
3+
<Import Project="..\..\..\build\runtimes.props" />
24
<PropertyGroup>
35
<!-- TODO: temporary while we reorganize source code and refactor dependency management -->
46
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>

0 commit comments

Comments
 (0)