Merge branch 'rel/1.1.0' into rel/1.1.0
This commit is contained in:
commit
6b1462dba7
2 changed files with 6 additions and 35 deletions
|
@ -4,36 +4,10 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# Dockerfile that creates a container suitable to build dotnet-cli
|
# Dockerfile that creates a container suitable to build dotnet-cli
|
||||||
FROM fedora:23
|
FROM microsoft/dotnet-buildtools-prereqs:fedora23_prereqs
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# Install tools used by the VSO build automation.
|
# Install tools used by the VSO build automation.
|
||||||
RUN dnf install -y git \
|
RUN dnf install -y findutils && \
|
||||||
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 && \
|
|
||||||
dnf clean all
|
dnf clean all
|
||||||
|
|
||||||
# Upgrade NSS, used for SSL, to avoid NuGet restore timeouts.
|
# Upgrade NSS, used for SSL, to avoid NuGet restore timeouts.
|
||||||
|
|
|
@ -25,18 +25,15 @@ namespace Microsoft.DotNet.New.Tests
|
||||||
[InlineData("F#", "mstest", false)]
|
[InlineData("F#", "mstest", false)]
|
||||||
[InlineData("F#", "xunit", false)]
|
[InlineData("F#", "xunit", false)]
|
||||||
[InlineData("F#", "mvc", true)]
|
[InlineData("F#", "mvc", true)]
|
||||||
|
[InlineData("VB", "console", false)]
|
||||||
|
[InlineData("VB", "classlib", false)]
|
||||||
|
[InlineData("VB", "mstest", false)]
|
||||||
|
[InlineData("VB", "xunit", false)]
|
||||||
public void TemplateRestoresAndBuildsWithoutWarnings(
|
public void TemplateRestoresAndBuildsWithoutWarnings(
|
||||||
string language,
|
string language,
|
||||||
string projectType,
|
string projectType,
|
||||||
bool useNuGetConfigForAspNet)
|
bool useNuGetConfigForAspNet)
|
||||||
{
|
{
|
||||||
if (language == "F#" && !EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
|
|
||||||
{
|
|
||||||
// F# requires netcoreapp1.0 to be present in order to build
|
|
||||||
// https://github.com/dotnet/netcorecli-fsc/issues/76
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
string rootPath = TestAssetsManager.CreateTestDirectory(identifier: $"{language}_{projectType}").Path;
|
string rootPath = TestAssetsManager.CreateTestDirectory(identifier: $"{language}_{projectType}").Path;
|
||||||
|
|
||||||
new TestCommand("dotnet") { WorkingDirectory = rootPath }
|
new TestCommand("dotnet") { WorkingDirectory = rootPath }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue