From 31849575f12fc7ac883126adb6f68ac430a9f7c4 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com> Date: Thu, 18 Oct 2018 13:48:06 -0700 Subject: [PATCH] Upgrade to .NET Core 2.1.6-servicing-27017-02 --- build/dependencies.props | 4 ++-- build/repo.props | 22 +--------------------- build/runtimes.props | 24 ++++++++++++++++++++++++ src/DataProtection/build/repo.props | 2 ++ 4 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 build/runtimes.props diff --git a/build/dependencies.props b/build/dependencies.props index 965160864cf..7de10ef40d2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -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.5</MicrosoftNETCoreAppPackageVersion> - <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.5</MicrosoftNETCoreDotNetAppHostPackageVersion> + <MicrosoftNETCoreAppPackageVersion>2.1.6-servicing-27017-02</MicrosoftNETCoreAppPackageVersion> + <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.6-servicing-27017-02</MicrosoftNETCoreDotNetAppHostPackageVersion> </PropertyGroup> <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> diff --git a/build/repo.props b/build/repo.props index 3c7b1970a28..ec2fe7ab7fc 100644 --- a/build/repo.props +++ b/build/repo.props @@ -42,27 +42,6 @@ <SharedFrameworkName Include="Microsoft.AspNetCore.App" /> </ItemGroup> - <ItemGroup> - <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by ASP.NET Core --> - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" Condition="'$(SharedFXRid)' != 'linux-musl-x64'" /> - - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" - Feed="$(DotNetAssetRootUrl)" - FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" /> - - <DotNetCoreRuntime Condition="'$(OS)' == 'Windows_NT'" - Include="$(MicrosoftNETCoreApp21PackageVersion)" - Arch="x86" - Feed="$(DotNetAssetRootUrl)" - FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" /> - - <!-- - The build doesn't support compiling the shared runtime on one machine along with running tests, - so this is enables installing the shared runtime from a previous build. - --> - <AspNetCoreRuntime Include="$(PackageVersion)" Feed="$(AspNetCoreFxFeed)" Condition="'$(InstallSharedRuntimeFromPreviousBuild)' == 'true'" /> - </ItemGroup> - <!-- Properties for publishing --> <PropertyGroup> <!-- myget = non-orchestrated builds --> @@ -74,6 +53,7 @@ <PublishToTransportFeed Condition="$(PublishType.Contains('blob'))">true</PublishToTransportFeed> </PropertyGroup> + <Import Project="runtimes.props" /> <Import Project="sources.props" /> <Import Project="external-dependencies.props" /> <Import Project="artifacts.props" /> diff --git a/build/runtimes.props b/build/runtimes.props new file mode 100644 index 00000000000..c6f84cb0da7 --- /dev/null +++ b/build/runtimes.props @@ -0,0 +1,24 @@ +<Project> + + <ItemGroup> + <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by ASP.NET Core --> + <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" Condition="'$(SharedFXRid)' != 'linux-musl-x64'" /> + + <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" + Feed="$(DotNetAssetRootUrl)" + FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" /> + + <DotNetCoreRuntime Condition="'$(OS)' == 'Windows_NT'" + Include="$(MicrosoftNETCoreApp21PackageVersion)" + Arch="x86" + Feed="$(DotNetAssetRootUrl)" + FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" /> + + <!-- + The build doesn't support compiling the shared runtime on one machine along with running tests, + so this is enables installing the shared runtime from a previous build. + --> + <AspNetCoreRuntime Include="$(PackageVersion)" Feed="$(AspNetCoreFxFeed)" Condition="'$(InstallSharedRuntimeFromPreviousBuild)' == 'true'" /> + </ItemGroup> + +</Project> diff --git a/src/DataProtection/build/repo.props b/src/DataProtection/build/repo.props index 59ae0807d30..37ae8832dc8 100644 --- a/src/DataProtection/build/repo.props +++ b/src/DataProtection/build/repo.props @@ -1,4 +1,6 @@ <Project> + <Import Project="..\..\..\build\dependencies.props" /> + <Import Project="..\..\..\build\runtimes.props" /> <PropertyGroup> <!-- TODO: temporary while we reorganize source code and refactor dependency management --> <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions> -- GitLab