Skip to content
代码片段 群组 项目
提交 31849575 编辑于 作者: dotnet-maestro-bot's avatar dotnet-maestro-bot 提交者: Nate McMaster
浏览文件

Upgrade to .NET Core 2.1.6-servicing-27017-02

上级 faa071b3
No related branches found
No related tags found
无相关合并请求
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<!-- These package versions may be overridden or updated by automation. --> <!-- These package versions may be overridden or updated by automation. -->
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' "> <PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. --> <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
<MicrosoftNETCoreAppPackageVersion>2.1.5</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>2.1.6-servicing-27017-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.5</MicrosoftNETCoreDotNetAppHostPackageVersion> <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.6-servicing-27017-02</MicrosoftNETCoreDotNetAppHostPackageVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
......
...@@ -42,27 +42,6 @@ ...@@ -42,27 +42,6 @@
<SharedFrameworkName Include="Microsoft.AspNetCore.App" /> <SharedFrameworkName Include="Microsoft.AspNetCore.App" />
</ItemGroup> </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 --> <!-- Properties for publishing -->
<PropertyGroup> <PropertyGroup>
<!-- myget = non-orchestrated builds --> <!-- myget = non-orchestrated builds -->
...@@ -74,6 +53,7 @@ ...@@ -74,6 +53,7 @@
<PublishToTransportFeed Condition="$(PublishType.Contains('blob'))">true</PublishToTransportFeed> <PublishToTransportFeed Condition="$(PublishType.Contains('blob'))">true</PublishToTransportFeed>
</PropertyGroup> </PropertyGroup>
<Import Project="runtimes.props" />
<Import Project="sources.props" /> <Import Project="sources.props" />
<Import Project="external-dependencies.props" /> <Import Project="external-dependencies.props" />
<Import Project="artifacts.props" /> <Import Project="artifacts.props" />
......
<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>
<Project> <Project>
<Import Project="..\..\..\build\dependencies.props" />
<Import Project="..\..\..\build\runtimes.props" />
<PropertyGroup> <PropertyGroup>
<!-- TODO: temporary while we reorganize source code and refactor dependency management --> <!-- TODO: temporary while we reorganize source code and refactor dependency management -->
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions> <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册