Merge pull request #7111 from dotnet/merges/rel/1.1.0-to-release/2.0.0-20170710-070025

Merge rel/1.1.0 to release/2.0.0
This commit is contained in:
Livar 2017-07-10 13:29:11 -07:00 committed by GitHub
commit a1bbdcdacb
2 changed files with 6 additions and 28 deletions

View file

@ -4,36 +4,10 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
FROM fedora:23
# 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 dnf install -y cmake \
clang \
lldb-devel \
make \
which && \
dnf clean all
FROM microsoft/dotnet-buildtools-prereqs:fedora23_prereqs
# Install tools used by the VSO build automation.
RUN dnf install -y git \
zip \
tar \
nodejs \
findutils \
npm && \
dnf clean all && \
npm install -g azure-cli && \
npm cache clean
# Dependencies of CoreCLR and CoreFX.
RUN dnf install -y libicu-devel \
libuuid-devel \
libcurl-devel \
openssl-devel \
libunwind-devel \
lttng-ust-devel && \
RUN dnf install -y findutils && \
dnf clean all
# Upgrade NSS, used for SSL, to avoid NuGet restore timeouts.

View file

@ -31,6 +31,10 @@ namespace Microsoft.DotNet.New.Tests
[InlineData("F#", "mstest", false, false)]
[InlineData("F#", "xunit", false, false)]
[InlineData("F#", "mvc", true, false)]
[InlineData("VB", "console", false, false)]
[InlineData("VB", "classlib", false, false)]
[InlineData("VB", "mstest", false, false)]
[InlineData("VB", "xunit", false, false)]
public void TemplateRestoresAndBuildsWithoutWarnings(
string language,
string projectType,