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

Small changes that I noticed when diffing the files

Browse source
This commit is contained in:
Livar Cunha 2016-05-26 23:33:37 -07:00
parent e634fedae8
commit 7963018d3d
6 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json
View file

@ -22,6 +22,7 @@
"ubuntu.16.04-x64": {}, "ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {},
"fedora.23-x64": {}
} }
} }

1
TestAssets/TestProjects/TestAppWithUnicodéPath/project.json
View file

@ -15,6 +15,7 @@
"osx.10.10-x64": {}, "osx.10.10-x64": {},
"osx.10.11-x64": {}, "osx.10.11-x64": {},
"ubuntu.14.04-x64": {}, "ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {}, "debian.8-x64": {},

3
build_projects/dotnet-cli-build/PublishTargets.cs
View file

@ -147,7 +147,8 @@ namespace Microsoft.DotNet.Cli.Build
{ "RHEL_x64", false }, { "RHEL_x64", false },
{ "OSX_x64", false }, { "OSX_x64", false },
{ "Debian_x64", false }, { "Debian_x64", false },
{ "CentOS_x64", false } { "CentOS_x64", false },
{ "Fedora_23_x64", false }
}; };
List<string> blobs = new List<string>(AzurePublisherTool.ListBlobs($"{Channel}/Binaries/{CliNuGetVersion}/")); List<string> blobs = new List<string>(AzurePublisherTool.ListBlobs($"{Channel}/Binaries/{CliNuGetVersion}/"));

3
build_projects/dotnet-cli-build/project.json
View file

@ -37,6 +37,7 @@
"ubuntu.16.04-x64": {}, "ubuntu.16.04-x64": {},
"centos.7-x64": {}, "centos.7-x64": {},
"rhel.7.2-x64": {}, "rhel.7.2-x64": {},
"debian.8-x64": {} "debian.8-x64": {},
"fedora.23-x64"
} }
} }

2
scripts/docker/fedora.23/Dockerfile
View file

@ -4,7 +4,7 @@
# #
# Dockerfile that creates a container suitable to build dotnet-cli # Dockerfile that creates a container suitable to build dotnet-cli
FROM chcosta/dotnetcore:fedora23_prereqs FROM fedora:23
# Install the base toolchain we need to build anything (clang, cmake, make and the like) # 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 # this does not include libraries that we need to compile different projects, we'd like

2
scripts/obtain/dotnet-install.sh vendored
View file

@ -82,7 +82,7 @@ get_current_os_name() {
elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then
echo "debian" echo "debian"
return 0 return 0
if [ "$(cat /etc/*-release | grep -cim1 fedora)" -eq 1 ]; then elif [ "$(cat /etc/*-release | grep -cim1 fedora)" -eq 1 ]; then
if [ "$(cat /etc/*-release | grep -cim1 23)" -eq 1 ]; then if [ "$(cat /etc/*-release | grep -cim1 23)" -eq 1 ]; then
echo "fedora.23" echo "fedora.23"
return 0 return 0