mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7191 from dotnet/merges/release/2.0.0-to-master-20170719-070023

Browse source 
Merge release/2.0.0 to master
This commit is contained in:
Livar 2017-07-19 13:14:14 -07:00 committed by GitHub
commit f009fa1b1d
2 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/DependencyVersions.props
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_SharedFrameworkVersion>2.0.0-preview3-25516-01</CLI_SharedFrameworkVersion>
<CLI_SharedFrameworkVersion>2.0.0-preview3-25518-01</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.3.407</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.3.0-beta4-61830-03</CLI_Roslyn_Version>
<CLI_Roslyn_Satellites_Version>2.3.0-pre-20170624-6</CLI_Roslyn_Satellites_Version>
@ -25,8 +25,8 @@
<TemplateEngineVersion>1.0.0-beta2-20170714-287</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170717-288</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170717-288</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>2.0.0-preview3-25516-01</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview3-25516-01</DependencyModelVersion>
<PlatformAbstractionsVersion>2.0.0-preview3-25518-01</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview3-25518-01</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
<CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
<MicroBuildVersion>0.2.0</MicroBuildVersion>

32
scripts/docker/opensuse.13.2/Dockerfile
View file

@ -3,37 +3,11 @@
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
#
FROM opensuse:13.2
FROM microsoft/dotnet-buildtools-prereqs:opensuse132_prereqs_v4
# Install the base toolchain we need to build anything (clang, cmake, make and the like)
# this does not include libraries that we need to compile different projects, we'd like
# them in a different layer.
RUN zypper -n install binutils \
cmake \
which \
gcc \
llvm-clang \
tar \
ncurses-utils \
curl \
git \
sudo && \
ln -s /usr/bin/clang++ /usr/bin/clang++-3.5 && \
RUN zypper -n install sudo \
ncurses-utils && \
zypper clean -a
# Dependencies of CoreCLR and CoreFX. We need to add an additional repository to get lttng.
RUN zypper addrepo -G http://download.opensuse.org/repositories/devel:/tools:/lttng/openSUSE_13.2/devel:tools:lttng.repo && \
zypper refresh && \
zypper -n remove krb5-mini && \
zypper -n install libunwind \
libicu \
lttng-ust \
libuuid1 \
libopenssl1_0_0 \
libcurl4 \
krb5 && \
zypper clean -a
# Setup User to match Host User, and give superuser permissions
ARG USER_ID=0
RUN useradd -m code_executor -u ${USER_ID} -g wheel