Merge pull request #5924 from dotnet/darc-master-6a61668a-7068-4dca-afb5-9b22f25fa509
[master] Update dependencies from dotnet/runtime
This commit is contained in:
Livar
GitHub
commit
5b25bb2604
4 changed files with 24 additions and 70 deletions
12
.vsts-ci.yml
12
.vsts-ci.yml
|
|
@ -114,12 +114,6 @@ stages:
|
|||
_LinuxPortable: ''
|
||||
_RuntimeIdentifier: ''
|
||||
_BuildArchitecture: 'x64'
|
||||
Build_Rhel_6_Debug_x64:
|
||||
_BuildConfig: Debug
|
||||
_DockerParameter: '--docker rhel.6'
|
||||
_LinuxPortable: ''
|
||||
_RuntimeIdentifier: '--runtime-id rhel.6-x64'
|
||||
_BuildArchitecture: 'x64'
|
||||
Build_Arm_Debug:
|
||||
_BuildConfig: Debug
|
||||
_DockerParameter: ''
|
||||
|
|
@ -151,12 +145,6 @@ stages:
|
|||
_LinuxPortable: '--linux-portable'
|
||||
_RuntimeIdentifier: '--runtime-id linux-arm64'
|
||||
_BuildArchitecture: 'arm64'
|
||||
Build_Rhel_6_Release_x64:
|
||||
_BuildConfig: Release
|
||||
_DockerParameter: '--docker rhel.6'
|
||||
_LinuxPortable: ''
|
||||
_RuntimeIdentifier: '--runtime-id rhel.6-x64'
|
||||
_BuildArchitecture: 'x64'
|
||||
Build_Linux_musl_Release_x64:
|
||||
_BuildConfig: Release
|
||||
_DockerParameter: '--docker alpine.3.6'
|
||||
|
|
|
|||
|
|
@ -13,25 +13,25 @@
|
|||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>780f26a116f0dce23207efba4ff348e747203604</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha.1.19564.1">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>c77948d92a2f950140f09384f057cb893ec3955a</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha.1.20057.6">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>c07be36e3ce00b06e99d02669fd658a813cdce11</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-alpha.1.19564.1">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>c77948d92a2f950140f09384f057cb893ec3955a</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-alpha.1.20057.6">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>c07be36e3ce00b06e99d02669fd658a813cdce11</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-alpha.1.19564.1">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>c77948d92a2f950140f09384f057cb893ec3955a</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-alpha.1.20057.6">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>c07be36e3ce00b06e99d02669fd658a813cdce11</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-alpha.1.19564.1">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>c77948d92a2f950140f09384f057cb893ec3955a</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-alpha.1.20057.6">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>c07be36e3ce00b06e99d02669fd658a813cdce11</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-alpha.1.19564.1">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>c77948d92a2f950140f09384f057cb893ec3955a</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-alpha.1.20057.6">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>c07be36e3ce00b06e99d02669fd658a813cdce11</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -39,9 +39,9 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha.1.19563.6" CoherentParentDependency="Microsoft.NetCore.App.Internal">
|
||||
<Uri>https://github.com/dotnet/corefx</Uri>
|
||||
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha.1.20057.6" CoherentParentDependency="Microsoft.NetCore.App.Internal">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>c07be36e3ce00b06e99d02669fd658a813cdce11</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-alpha.1.20056.6">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
|
|
|
|||
|
|
@ -63,15 +63,15 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha.1.20057.6</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-alpha.1.19564.1</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-alpha.1.19564.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-alpha.1.19564.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-alpha.1.19564.1</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-alpha.1.19564.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-alpha.1.20057.6</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-alpha.1.20057.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-alpha.1.20057.6</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-alpha.1.20057.6</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-alpha.1.20057.6</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
#
|
||||
# Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
#
|
||||
|
||||
# Dockerfile that creates a container suitable to build dotnet-cli
|
||||
FROM microsoft/dotnet-buildtools-prereqs:centos-6-376e1a3-20174311014331
|
||||
|
||||
# yum doesn't work with the special curl version we have in the base docker image,
|
||||
# so we remove /usr/local/lib from the library path for this command
|
||||
RUN yum -q -y install sudo
|
||||
|
||||
# Setup User to match Host User, and give superuser permissions
|
||||
ARG USER_ID=0
|
||||
RUN useradd -m code_executor -u ${USER_ID} -g root
|
||||
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
# With the User Change, we need to change permssions on these directories
|
||||
RUN chmod -R a+rwx /usr/local
|
||||
RUN chmod -R a+rwx /home
|
||||
RUN chmod -R 755 /usr/bin/sudo
|
||||
|
||||
# Set user to the one we just created
|
||||
USER ${USER_ID}
|
||||
|
||||
# Set library path to make CURL and ICU libraries that are in /usr/local/lib visible
|
||||
ENV LD_LIBRARY_PATH /usr/local/lib
|
||||
|
||||
# Set working directory
|
||||
ARG WORK_DIR
|
||||
WORKDIR ${WORK_DIR}
|
||||
|
||||
# Set up Azure Artifacts credential provider
|
||||
RUN wget -qO- https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh | bash
|
||||
Loading…
Reference in a new issue