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

Remove OpenSUSE13 and Fedora23 since they are end of lifed.

Browse source
This commit is contained in:
Eric Erhardt 2017-03-01 15:12:16 -06:00
parent b3b4e4257c
commit b64068291b
13 changed files with 33 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
View file

@ -3,7 +3,7 @@
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks> <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net45</TargetFramework> <TargetFramework>net45</TargetFramework>
<AssemblyName>PackageWithFakeNativeDep</AssemblyName> <AssemblyName>PackageWithFakeNativeDep</AssemblyName>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;osx.10.10-x64;rhel.7-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
View file

@ -9,7 +9,7 @@
<FrameworkRuntimeVersion>$(CLI_SharedFrameworkVersion)</FrameworkRuntimeVersion> <FrameworkRuntimeVersion>$(CLI_SharedFrameworkVersion)</FrameworkRuntimeVersion>
<AssemblyName>dotnet-hello</AssemblyName> <AssemblyName>dotnet-hello</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
View file

@ -9,7 +9,7 @@
<FrameworkRuntimeVersion>$(CLI_SharedFrameworkVersion)</FrameworkRuntimeVersion> <FrameworkRuntimeVersion>$(CLI_SharedFrameworkVersion)</FrameworkRuntimeVersion>
<AssemblyName>dotnet-hello</AssemblyName> <AssemblyName>dotnet-hello</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
build/Branding.props
View file

@ -12,7 +12,7 @@
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName> <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
<SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName> <SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
<ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' Or '$(Rid)' == 'fedora.23-x64' Or '$(Rid)' == 'opensuse.13.2-x64' ">$(Rid)</ProductMonikerRid> <ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' ">$(Rid)</ProductMonikerRid>
<ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid> <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
<ArtifactNameSdk>dotnet-sdk</ArtifactNameSdk> <ArtifactNameSdk>dotnet-sdk</ArtifactNameSdk>

2
build/VersionBadge.props
View file

@ -2,8 +2,6 @@
<PropertyGroup> <PropertyGroup>
<VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker> <VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
<VersionBadgeMoniker Condition=" '$(Rid)' == 'ubuntu.16.04-x64' ">ubuntu_16_04_x64</VersionBadgeMoniker> <VersionBadgeMoniker Condition=" '$(Rid)' == 'ubuntu.16.04-x64' ">ubuntu_16_04_x64</VersionBadgeMoniker>
<VersionBadgeMoniker Condition=" '$(Rid)' == 'fedora.23-x64' ">fedora_23_x64</VersionBadgeMoniker>
<VersionBadgeMoniker Condition=" '$(Rid)' == 'opensuse.13.2-x64' ">openSUSE_13_2_x64</VersionBadgeMoniker>
<VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge> <VersionBadge>$(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
</PropertyGroup> </PropertyGroup>

3
build/publish/FinishBuild.targets
View file

@ -8,7 +8,8 @@
<CheckIfAllBuildsHavePublished AccountKey="$(ArtifactCloudDropAccessToken)" <CheckIfAllBuildsHavePublished AccountKey="$(ArtifactCloudDropAccessToken)"
AccountName="$(ArtifactCloudDropAccountName)" AccountName="$(ArtifactCloudDropAccountName)"
ContainerName="$(ArtifactContainerName)" ContainerName="$(ArtifactContainerName)"
NugetVersion="$(FullNugetVersion)"> NugetVersion="$(FullNugetVersion)"
VersionBadgeMoniker="$(VersionBadgeMoniker)">
<Output TaskParameter="HaveAllBuildsPublished" PropertyName="HaveAllBuildsPublished" /> <Output TaskParameter="HaveAllBuildsPublished" PropertyName="HaveAllBuildsPublished" />
</CheckIfAllBuildsHavePublished> </CheckIfAllBuildsHavePublished>
</Target> </Target>

10
build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs
View file

@ -26,6 +26,9 @@ namespace Microsoft.DotNet.Cli.Build
[Required] [Required]
public string NugetVersion { get; set; } public string NugetVersion { get; set; }
[Required]
public string VersionBadgeMoniker { get; set; }
[Output] [Output]
public string HaveAllBuildsPublished { get; set; } public string HaveAllBuildsPublished { get; set; }
@ -54,14 +57,11 @@ namespace Microsoft.DotNet.Cli.Build
{ "osx_x64", false }, { "osx_x64", false },
{ "debian_x64", false }, { "debian_x64", false },
{ "centos_x64", false }, { "centos_x64", false },
{ "fedora_23_x64", false },
{ "openSUSE_13_2_x64", false }
}; };
var versionBadgeName = $"{Monikers.GetBadgeMoniker()}"; if (!badges.ContainsKey(VersionBadgeMoniker))
if (!badges.ContainsKey(versionBadgeName))
{ {
throw new ArgumentException($"A new OS build '{versionBadgeName}' was added without adding the moniker to the {nameof(badges)} lookup"); throw new ArgumentException($"A new OS build '{VersionBadgeMoniker}' was added without adding the moniker to the {nameof(badges)} lookup");
} }
IEnumerable<string> blobs = AzurePublisherTool.ListBlobs(AzurePublisher.Product.Sdk, NugetVersion); IEnumerable<string> blobs = AzurePublisherTool.ListBlobs(AzurePublisher.Product.Sdk, NugetVersion);

19
build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs
View file

@ -3,6 +3,7 @@
using Microsoft.Build.Framework; using Microsoft.Build.Framework;
using Microsoft.Build.Utilities; using Microsoft.Build.Utilities;
using Microsoft.DotNet.Cli.Build.Framework;
using Microsoft.DotNet.PlatformAbstractions; using Microsoft.DotNet.PlatformAbstractions;
namespace Microsoft.DotNet.Cli.Build namespace Microsoft.DotNet.Cli.Build
@ -22,9 +23,25 @@ namespace Microsoft.DotNet.Cli.Build
{ {
Rid = RuntimeEnvironment.GetRuntimeIdentifier(); Rid = RuntimeEnvironment.GetRuntimeIdentifier();
Architecture = RuntimeEnvironment.RuntimeArchitecture; Architecture = RuntimeEnvironment.RuntimeArchitecture;
OSName = Monikers.GetOSShortName(); OSName = GetOSShortName();
return true; return true;
} }
private static string GetOSShortName()
{
string osname = "";
switch (CurrentPlatform.Current)
{
case BuildPlatform.Windows:
osname = "win";
break;
default:
osname = CurrentPlatform.Current.ToString().ToLower();
break;
}
return osname;
}
} }
} }

43
build_projects/shared-build-targets-utils/Utils/Monikers.cs
View file

@ -1,43 +0,0 @@
using Microsoft.DotNet.Cli.Build.Framework;
using Microsoft.DotNet.PlatformAbstractions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Microsoft.DotNet.Cli.Build
{
public class Monikers
{
public static string GetBadgeMoniker()
{
switch (RuntimeEnvironment.GetRuntimeIdentifier())
{
case "ubuntu.16.04-x64":
return "Ubuntu_16_04_x64";
case "fedora.23-x64":
return "Fedora_23_x64";
case "opensuse.13.2-x64":
return "openSUSE_13_2_x64";
}
return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}";
}
public static string GetOSShortName()
{
string osname = "";
switch (CurrentPlatform.Current)
{
case BuildPlatform.Windows:
osname = "win";
break;
default:
osname = CurrentPlatform.Current.ToString().ToLower();
break;
}
return osname;
}
}
}

2
netci.groovy
View file

@ -9,7 +9,7 @@ def project = GithubProject
def branch = GithubBranchName def branch = GithubBranchName
def isPR = true def isPR = true
def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora23:x64:Debug', 'OpenSUSE13.2:x64:Debug'] def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug']
def static getBuildJobName(def configuration, def os, def architecture) { def static getBuildJobName(def configuration, def os, def architecture) {
return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()

2
tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
View file

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;osx.10.10-x64;rhel.7-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>