Merge pull request #5800 from eerhardt/Add11Platforms_101
Add Fedora24, OpenSUSE42, and Ubuntu 16.10
This commit is contained in:
Piotr Puszkiewicz
GitHub
commit
31742376ef
60 changed files with 441 additions and 210 deletions
|
|
@ -1 +1 @@
|
|||
1.0.0-preview3-003930
|
||||
1.0.0-preview2-1-003177
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
microsoft.dotnet.buildtools=1.0.26-prerelease-00926-02
|
||||
microsoft.dotnet.buildtools=1.0.27-prerelease-01316-08
|
||||
microsoft.dotnet.buildtools.run=1.0.0-prerelease-00807-04
|
||||
|
|
@ -37,6 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
|
|||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{FD7D515A-D10F-4F49-B8AE-21CF7ED071AE}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
build\package\dotnet-deb-tool-consumer.csproj = build\package\dotnet-deb-tool-consumer.csproj
|
||||
build\package\Microsoft.DotNet.Cli.Archive.targets = build\package\Microsoft.DotNet.Cli.Archive.targets
|
||||
build\package\Microsoft.DotNet.Cli.Installer.DEB.proj = build\package\Microsoft.DotNet.Cli.Installer.DEB.proj
|
||||
build\package\Microsoft.DotNet.Cli.Installer.DEB.targets = build\package\Microsoft.DotNet.Cli.Installer.DEB.targets
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
|
||||
<TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
|
||||
<OutputType>Exe</OutputType>
|
||||
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
|
||||
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(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>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -11,11 +12,6 @@
|
|||
<Version>1.0.0-*</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.3</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
|
||||
<Reference Include="System" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -25,7 +21,4 @@
|
|||
<Version>1.0.0-*</Version>
|
||||
</DotNetCliToolReference>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
<AssemblyName>AppWithRedirectsAndConfig</AssemblyName>
|
||||
<OutputType>Exe</OutputType>
|
||||
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
<AssemblyName>AppWithRedirectsNoConfig</AssemblyName>
|
||||
<OutputType>Exe</OutputType>
|
||||
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
|
||||
<OutputType>Library</OutputType>
|
||||
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.0</PackageTargetFallback>
|
||||
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.1</PackageTargetFallback>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<AssemblyName>dotnet-throwingtool</AssemblyName>
|
||||
<PackageId>$(AssemblyName)</PackageId>
|
||||
</PropertyGroup>
|
||||
|
|
@ -13,10 +13,4 @@
|
|||
</BuiltProjectOutputGroupOutput>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.3</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,15 +2,10 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.3</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<DotNetCliToolReference Include="dotnet-throwingtool">
|
||||
<Version>1.0.0</Version>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<GeneratedPackageId>random-name</GeneratedPackageId>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
|
||||
<DotNetCliToolReference Include="$(GeneratedPackageId)">
|
||||
<Version>1.0.0</Version>
|
||||
</DotNetCliToolReference>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<GeneratedPackageId>random-name</GeneratedPackageId>
|
||||
<PackageId>$(GeneratedPackageId)</PackageId>
|
||||
<AssemblyName>dotnet-randompackage</AssemblyName>
|
||||
|
|
@ -14,8 +14,4 @@
|
|||
</BuiltProjectOutputGroupOutput>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.3" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<AssemblyName>dotnet-tool-with-output-name</AssemblyName>
|
||||
<PackageId>ToolWithOutputName</PackageId>
|
||||
<OutputType>Exe</OutputType>
|
||||
|
|
@ -12,13 +12,4 @@
|
|||
</BuiltProjectOutputGroupOutput>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.4</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -3,10 +3,11 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<VersionPrefix>1.0.0-rc</VersionPrefix>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<AssemblyName>dotnet-dependency-tool-invoker</AssemblyName>
|
||||
<OutputType>Exe</OutputType>
|
||||
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
|
||||
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
|
||||
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
@ -22,9 +23,6 @@
|
|||
</BuiltProjectOutputGroupOutput>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.4</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="NuGet.Frameworks">
|
||||
<Version>$(CLI_NuGet_Version)</Version>
|
||||
</PackageReference>
|
||||
|
|
@ -32,8 +30,4 @@
|
|||
<Version>$(SdkNugetVersion)</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,24 +1,18 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
|
||||
<PropertyGroup>
|
||||
<VersionPrefix>1.0.0-rc</VersionPrefix>
|
||||
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
|
||||
<TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
|
||||
<AssemblyName>dotnet-desktop-and-portable</AssemblyName>
|
||||
<OutputType>Exe</OutputType>
|
||||
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
|
||||
<BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)">
|
||||
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
|
||||
</BuiltProjectOutputGroupOutput>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.4</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
|
||||
<Reference Include="System" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<AssemblyName>dotnet-portable</AssemblyName>
|
||||
<OutputType>Exe</OutputType>
|
||||
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -12,14 +13,4 @@
|
|||
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
|
||||
</BuiltProjectOutputGroupOutput>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.4</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -14,7 +15,4 @@
|
|||
<Version>1.0.0</Version>
|
||||
</DotNetCliToolReference>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -17,7 +18,4 @@
|
|||
<Version>1.0.0</Version>
|
||||
</DotNetCliToolReference>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,23 +1,18 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ToolWithOutputName">
|
||||
<Version>1.0.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.3</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<DotNetCliToolReference Include="dotnet-dependency-tool-invoker">
|
||||
<Version>1.0.0-*</Version>
|
||||
</DotNetCliToolReference>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,10 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.3</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<DotNetCliToolReference Include="dotnet-portable">
|
||||
<Version>1.0.0</Version>
|
||||
|
|
@ -17,7 +13,4 @@
|
|||
<Version>1.0.0</Version>
|
||||
</DotNetCliToolReference>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<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>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;fedora.24-x64;opensuse.13.2-x64;opensuse.42.1-x64</RuntimeIdentifiers>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="dotnet-portable">
|
||||
<Version>1.0.0</Version>
|
||||
<PrivateAssets>All</PrivateAssets>
|
||||
|
|
|
|||
|
|
@ -2,13 +2,11 @@
|
|||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="MSTest.TestFramework">
|
||||
<Version>1.0.6-preview</Version>
|
||||
</PackageReference>
|
||||
|
|
|
|||
|
|
@ -2,13 +2,11 @@
|
|||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App">
|
||||
<Version>1.0.3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk">
|
||||
<Version>$(CLI_TestPlatform_Version)</Version>
|
||||
</PackageReference>
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<SdkBrandName>.NET Core SDK 1.0.1 ($(Architecture)) Installer</SdkBrandName>
|
||||
<SharedFrameworkBrandName>Microsoft .NET Core 1.0.4 - Runtime</SharedFrameworkBrandName>
|
||||
<SharedFrameworkBrandName>Microsoft .NET Core 1.1.1 - Runtime</SharedFrameworkBrandName>
|
||||
<SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName>
|
||||
<HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName>
|
||||
|
||||
<AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.1.1 - Runtime</AdditionalSharedFrameworkBrandName>
|
||||
<AdditionalSharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</AdditionalSharedHostBrandName>
|
||||
<AdditionalHostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</AdditionalHostFxrBrandName>
|
||||
<AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.4 - Runtime</AdditionalSharedFrameworkBrandName>
|
||||
<AdditionalSharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</AdditionalSharedHostBrandName>
|
||||
<AdditionalHostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</AdditionalHostFxrBrandName>
|
||||
|
||||
<SharedFrameworkNugetName>Microsoft.NETCore.App</SharedFrameworkNugetName>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -95,7 +95,12 @@
|
|||
<BundleExtension Condition=" '$(OSName)' == 'osx' ">$(InstallerExtension)</BundleExtension>
|
||||
<BundleExtension Condition=" '$(OSName)' == 'ubuntu' ">$(InstallerExtension)</BundleExtension>
|
||||
|
||||
<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' Or
|
||||
'$(Rid)' == 'ubuntu.16.10-x64' Or
|
||||
'$(Rid)' == 'fedora.23-x64' Or
|
||||
'$(Rid)' == 'fedora.24-x64' Or
|
||||
'$(Rid)' == 'opensuse.13.2-x64' Or
|
||||
'$(Rid)' == 'opensuse.42.1-x64' ">$(Rid)</ProductMonikerRid>
|
||||
<ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
|
||||
|
||||
<DynamicLibPrefix>lib</DynamicLibPrefix>
|
||||
|
|
@ -127,8 +132,16 @@
|
|||
<CombinedFrameworkHostCompressedFileName>dotnet-$(ProductMonikerRid).$(SharedFrameworkVersion)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Additional Shared Framework to be installed -->
|
||||
<PropertyGroup>
|
||||
<HasAdditionalSharedFramework Condition="'$(Rid)' != 'ubuntu.16.10-x64' AND
|
||||
'$(Rid)' != 'fedora.24-x64' AND
|
||||
'$(Rid)' != 'opensuse.42.1-x64'">true</HasAdditionalSharedFramework>
|
||||
<IncludeAdditionalSharedFrameworks Condition=" '$(IncludeAdditionalSharedFrameworks)' == '' AND '$(HasAdditionalSharedFramework)' == 'true' ">true</IncludeAdditionalSharedFrameworks>
|
||||
<IncludeAdditionalSharedFrameworks Condition=" '$(IncludeAdditionalSharedFrameworks)' == '' ">false</IncludeAdditionalSharedFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Additional Shared Framework to be installed -->
|
||||
<PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">
|
||||
<AdditionalCoreSetupChannel>preview</AdditionalCoreSetupChannel>
|
||||
<AdditionalSharedFrameworkVersion>1.0.4</AdditionalSharedFrameworkVersion>
|
||||
<AdditionalSharedHostVersion>1.0.1</AdditionalSharedHostVersion>
|
||||
|
|
@ -193,7 +206,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<!-- Additional Shared Framework to be installed -->
|
||||
<PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' != 'false' ">
|
||||
<AdditionalCoreSetupBlobRootUrlWithChannel>$(CoreSetupBlobRootUrl)$(AdditionalCoreSetupChannel)</AdditionalCoreSetupBlobRootUrlWithChannel>
|
||||
<AdditionalSharedFrameworkArchiveBlobRootUrl>$(AdditionalCoreSetupBlobRootUrlWithChannel)/Binaries/$(AdditionalSharedFrameworkVersion)</AdditionalSharedFrameworkArchiveBlobRootUrl>
|
||||
<AdditionalCoreSetupInstallerBlobRootUrl>$(AdditionalCoreSetupBlobRootUrlWithChannel)/Installers</AdditionalCoreSetupInstallerBlobRootUrl>
|
||||
|
|
@ -201,7 +214,7 @@
|
|||
<AdditionalCombinedSharedHostAndFrameworkArchive>$(AdditionalCoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</AdditionalCombinedSharedHostAndFrameworkArchive>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ItemGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' != 'false' ">
|
||||
<_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive"
|
||||
Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')">
|
||||
<Url>$(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName)</Url>
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
ReplacementStrings="@(DebianConfigTokenValues -> '%(ReplacementString)')" />
|
||||
|
||||
<!-- Build SDK Deb package -->
|
||||
<DotNetDebTool ToolPath="$(Stage0PjDirectory)"
|
||||
<DotNetDebTool ToolPath="$(Stage0Directory)"
|
||||
InputDirectory="$(LayoutDirectory)"
|
||||
OutputDirectory="$(DotNetDebToolOutputDirectory)"
|
||||
PackageName="$(SdkDebianPackageName)"
|
||||
|
|
@ -75,8 +75,10 @@
|
|||
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
||||
|
||||
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)"
|
||||
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)"
|
||||
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||
|
||||
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
||||
</Target>
|
||||
|
|
@ -90,9 +92,12 @@
|
|||
Outputs="$(DebianTestResultsXmlFile)" >
|
||||
|
||||
<!-- Install Dependencies and SDK Packages -->
|
||||
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedHostInstallerFile)" />
|
||||
<Exec Command="sudo dpkg -i $(AdditionalDownloadedHostFxrInstallerFile)" />
|
||||
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedFrameworkInstallerFile)" />
|
||||
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedHostInstallerFile)"
|
||||
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||
<Exec Command="sudo dpkg -i $(AdditionalDownloadedHostFxrInstallerFile)"
|
||||
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||
<Exec Command="sudo dpkg -i $(AdditionalDownloadedSharedFrameworkInstallerFile)"
|
||||
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||
|
||||
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
|
||||
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
|
||||
|
|
@ -113,8 +118,10 @@
|
|||
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
||||
|
||||
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)" />
|
||||
<Exec Command="sudo dpkg -r $(AdditionalSharedFxDebianPackageName)"
|
||||
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||
<Exec Command="sudo dpkg -r $(AdditionalHostFxrDebianPackageName)"
|
||||
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'" />
|
||||
|
||||
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
||||
</Target>
|
||||
|
|
@ -148,23 +155,19 @@
|
|||
</Target>
|
||||
|
||||
<Target Name="PrepareDotnetDebTool"
|
||||
DependsOnTargets="WriteDotnetDebToolProjectJson;">
|
||||
DependsOnTargets="WriteDotnetDebToolProject">
|
||||
|
||||
<DotNetRestorePj FallbackSource="$(DotnetDebToolPackageSource)"
|
||||
ToolPath="$(Stage0PjDirectory)"
|
||||
WorkingDirectory="$(DotnetDebToolDir)" />
|
||||
<DotNetRestore ToolPath="$(Stage0Directory)"
|
||||
WorkingDirectory="$(DotnetDebToolDir)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="WriteDotnetDebToolProjectJson"
|
||||
Inputs="$(MSBuildThisFile);$(MSBuildThisFileDirectory)/Microsoft.DotNet.Cli.Installer.DEB.props"
|
||||
Outputs="$(DotnetDebToolDir)/project.json">
|
||||
<Target Name="WriteDotnetDebToolProject"
|
||||
Inputs="$(MSBuildThisFileDirectory)/$(DotnetDebToolConsumerProjectName)"
|
||||
Outputs="$(DotnetDebToolDir)/$(DotnetDebToolConsumerProjectName)">
|
||||
|
||||
<MakeDir Condition=" !Exists($(DotnetDebToolDir)) "
|
||||
Directories="$(DotnetDebToolDir)" />
|
||||
<Copy SourceFiles="$(MSBuildThisFileDirectory)/$(DotnetDebToolConsumerProjectName)"
|
||||
DestinationFiles="$(DotnetDebToolDir)/$(DotnetDebToolConsumerProjectName)" />
|
||||
|
||||
<WriteLinesToFile File="$(DotnetDebToolDir)/project.json"
|
||||
Lines="@(DotnetDebToolProjectJsonLines)"
|
||||
Overwrite="True" />
|
||||
</Target>
|
||||
|
||||
<Target Name="TestDebuild">
|
||||
|
|
|
|||
|
|
@ -4,22 +4,10 @@
|
|||
DependsOnTargets="Init">
|
||||
<!-- dotnet deb-tool -->
|
||||
<PropertyGroup>
|
||||
<DotnetDebToolPackageId>dotnet-deb-tool</DotnetDebToolPackageId>
|
||||
<DotnetDebToolVersion Condition=" '$(DotnetDebToolVersion)' == '' ">1.0.0-*</DotnetDebToolVersion>
|
||||
<DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer</DotnetDebToolConsumerProjectName>
|
||||
<DotnetDebToolConsumerProjectName>dotnet-deb-tool-consumer.csproj</DotnetDebToolConsumerProjectName>
|
||||
<DotnetDebToolDir>$(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName)</DotnetDebToolDir>
|
||||
<DotnetDebToolPackageSource Condition=" '$(DotnetDebToolPackageSource)' == '' "></DotnetDebToolPackageSource>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<DotnetDebToolProjectJsonLines Include="{" />
|
||||
<DotnetDebToolProjectJsonLines Include="%20%20%20%20"version": "1.0.0-*"," />
|
||||
<DotnetDebToolProjectJsonLines Include="%20%20%20%20"name": "$(DotnetDebToolConsumerProjectName)"," />
|
||||
<DotnetDebToolProjectJsonLines Include="%20%20%20%20"frameworks": { "netcoreapp1.0": {}, "netcoreapp1.1": {} }," />
|
||||
<DotnetDebToolProjectJsonLines Include="%20%20%20%20"tools": {"$(DotnetDebToolPackageId)": "$(DotnetDebToolVersion)" }" />
|
||||
<DotnetDebToolProjectJsonLines Include="}" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- constants -->
|
||||
<PropertyGroup>
|
||||
<DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
|
||||
|
|
@ -93,8 +81,13 @@
|
|||
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%">
|
||||
<ReplacementString>$(SharedFxDebianPackageName)</ReplacementString>
|
||||
</DebianConfigTokenValues>
|
||||
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME_ADDITIONAL%">
|
||||
<ReplacementString>$(AdditionalSharedFxDebianPackageName)</ReplacementString>
|
||||
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%"
|
||||
Condition="'$(IncludeAdditionalSharedFrameworks)' == 'true'">
|
||||
<ReplacementString>"$(AdditionalSharedFxDebianPackageName)" : {}</ReplacementString>
|
||||
</DebianConfigTokenValues>
|
||||
<DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%"
|
||||
Condition="'$(IncludeAdditionalSharedFrameworks)' != 'true'">
|
||||
<ReplacementString></ReplacementString>
|
||||
</DebianConfigTokenValues>
|
||||
<DebianConfigTokenValues Include="%SDK_NUGET_VERSION%">
|
||||
<ReplacementString>$(SdkVersion)</ReplacementString>
|
||||
|
|
|
|||
8
build/package/dotnet-deb-tool-consumer.csproj
Normal file
8
build/package/dotnet-deb-tool-consumer.csproj
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<DotNetCliToolReference Include="dotnet-deb-tool" Version="2.0.0-*" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -50,12 +50,15 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
{ "Windows_x64", false },
|
||||
{ "Ubuntu_x64", false },
|
||||
{ "Ubuntu_16_04_x64", false },
|
||||
{ "Ubuntu_16_10_x64", false },
|
||||
{ "RHEL_x64", false },
|
||||
{ "OSX_x64", false },
|
||||
{ "Debian_x64", false },
|
||||
{ "CentOS_x64", false },
|
||||
{ "Fedora_23_x64", false },
|
||||
{ "openSUSE_13_2_x64", false }
|
||||
{ "Fedora_24_x64", false },
|
||||
{ "openSUSE_13_2_x64", false },
|
||||
{ "openSUSE_42_1_x64", false },
|
||||
};
|
||||
|
||||
var versionBadgeName = $"{Monikers.GetBadgeMoniker()}";
|
||||
|
|
|
|||
|
|
@ -15,10 +15,16 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
{
|
||||
case "ubuntu.16.04-x64":
|
||||
return "Ubuntu_16_04_x64";
|
||||
case "ubuntu.16.10-x64":
|
||||
return "Ubuntu_16_10_x64";
|
||||
case "fedora.23-x64":
|
||||
return "Fedora_23_x64";
|
||||
case "fedora.24-x64":
|
||||
return "Fedora_24_x64";
|
||||
case "opensuse.13.2-x64":
|
||||
return "openSUSE_13_2_x64";
|
||||
case "opensuse.42.1-x64":
|
||||
return "openSUSE_42_1_x64";
|
||||
}
|
||||
|
||||
return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
<AssemblyName>update-dependencies</AssemblyName>
|
||||
<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;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;fedora.24-x64;opensuse.13.2-x64;opensuse.42.1-x64</RuntimeIdentifiers>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ def project = GithubProject
|
|||
def branch = GithubBranchName
|
||||
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', 'Ubuntu16.10:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora23:x64:Debug', 'Fedora24:x64:Release', 'OpenSUSE13.2:x64:Debug', 'OpenSUSE42.1:x64:Debug']
|
||||
|
||||
def static getBuildJobName(def configuration, def os, def architecture) {
|
||||
return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
|
||||
|
|
|
|||
|
|
@ -30,6 +30,6 @@
|
|||
|
||||
"debian_dependencies":{
|
||||
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {},
|
||||
"%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME_ADDITIONAL%" : {}
|
||||
%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ if ($LastExitCode -ne 0)
|
|||
# install the post-PJnistic stage0
|
||||
$dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1"
|
||||
|
||||
Write-Host "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
|
||||
Invoke-Expression "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
|
||||
Write-Host "$dotnetInstallPath -Version ""1.0.0-rc4-004840"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
|
||||
Invoke-Expression "$dotnetInstallPath -Version ""1.0.0-rc4-004840"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
|
||||
if ($LastExitCode -ne 0)
|
||||
{
|
||||
Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
|
||||
|
|
|
|||
|
|
@ -155,7 +155,8 @@ if [ ! -f $bootStrapperPath ]; then
|
|||
chmod u+x $bootStrapperPath
|
||||
fi
|
||||
|
||||
$bootStrapperPath --repositoryRoot "$REPOROOT" --toolsLocalPath "$toolsLocalPath" --cliInstallPath $DOTNET_INSTALL_DIR_PJ --architecture $ARCHITECTURE > bootstrap.log
|
||||
echo "installing build_tools: $bootStrapperPath --repositoryRoot \"$REPOROOT\" --toolsLocalPath \"$toolsLocalPath\" --cliInstallPath $DOTNET_INSTALL_DIR_PJ --architecture $ARCHITECTURE"
|
||||
$bootStrapperPath --repositoryRoot "$REPOROOT" --toolsLocalPath "$toolsLocalPath" --cliInstallPath $DOTNET_INSTALL_DIR_PJ --architecture $ARCHITECTURE --verbose
|
||||
|
||||
if [ $? != 0 ]; then
|
||||
echo "run-build: Error: Boot-strapping failed with exit code $?, see bootstrap.log for more information." >&2
|
||||
|
|
@ -163,8 +164,8 @@ if [ $? != 0 ]; then
|
|||
fi
|
||||
|
||||
# now execute the script
|
||||
echo "installing CLI: $dotnetInstallPath --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
|
||||
$dotnetInstallPath --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
|
||||
echo "installing CLI: $dotnetInstallPath --version \"1.0.0-rc4-004840\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
|
||||
$dotnetInstallPath --version "1.0.0-rc4-004840" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
|
||||
if [ $? != 0 ]; then
|
||||
echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
|
||||
exit $?
|
||||
|
|
|
|||
28
scripts/docker/fedora.24/Dockerfile
Normal file
28
scripts/docker/fedora.24/Dockerfile
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
FROM fedora:24
|
||||
|
||||
RUN dnf install -y bash git cmake wget which python clang-3.8.0-1.fc24.x86_64 llvm-devel-3.8.0-1.fc24.x86_64 make libicu-devel lldb-devel.x86_64 \
|
||||
libunwind-devel.x86_64 lttng-ust-devel.x86_64 uuid-devel libuuid-devel tar glibc-locale-source zlib-devel libcurl-devel \
|
||||
krb5-devel openssl-devel autoconf libtool hostname
|
||||
|
||||
RUN dnf upgrade -y nss
|
||||
|
||||
RUN dnf clean all
|
||||
|
||||
# Set a different rid to publish buildtools for, until we update to a version which
|
||||
# natively supports fedora.24-x64
|
||||
ENV __PUBLISH_RID=fedora.23-x64
|
||||
|
||||
# Setup User to match Host User, and give superuser permissions
|
||||
ARG USER_ID=0
|
||||
RUN useradd -m code_executor -u ${USER_ID} -g wheel
|
||||
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
# With the User Change, we need to change permissions on these directories
|
||||
RUN chmod -R a+rwx /usr/local
|
||||
RUN chmod -R a+rwx /home
|
||||
|
||||
# Set user to the one we just created
|
||||
USER ${USER_ID}
|
||||
|
||||
# Set working directory
|
||||
WORKDIR /opt/code
|
||||
50
scripts/docker/opensuse.42.1/Dockerfile
Normal file
50
scripts/docker/opensuse.42.1/Dockerfile
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
#
|
||||
# Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
#
|
||||
|
||||
FROM opensuse:42.1
|
||||
|
||||
# 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 && \
|
||||
zypper clean -a
|
||||
|
||||
# Dependencies of CoreCLR and CoreFX.
|
||||
|
||||
RUN zypper -n install --force-resolution \
|
||||
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
|
||||
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
# With the User Change, we need to change permissions on these directories
|
||||
RUN chmod -R a+rwx /usr/local
|
||||
RUN chmod -R a+rwx /home
|
||||
RUN chmod -R 755 /usr/lib/sudo
|
||||
|
||||
# Set user to the one we just created
|
||||
USER ${USER_ID}
|
||||
|
||||
# Set working directory
|
||||
WORKDIR /opt/code
|
||||
63
scripts/docker/ubuntu.16.10/Dockerfile
Normal file
63
scripts/docker/ubuntu.16.10/Dockerfile
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
#
|
||||
# Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
#
|
||||
|
||||
# Dockerfile that creates a container suitable to build dotnet-cli
|
||||
FROM ubuntu:16.10
|
||||
|
||||
# Misc Dependencies for build
|
||||
RUN apt-get update && \
|
||||
apt-get -qqy install \
|
||||
curl \
|
||||
unzip \
|
||||
gettext \
|
||||
sudo && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib)
|
||||
RUN apt-get update && \
|
||||
apt-get -qqy install \
|
||||
libunwind8 \
|
||||
libkrb5-3 \
|
||||
libicu57 \
|
||||
liblttng-ust0 \
|
||||
libssl1.0.0 \
|
||||
zlib1g \
|
||||
libuuid1 \
|
||||
liblldb-3.5 && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Build Prereqs
|
||||
RUN apt-get update && \
|
||||
apt-get -qqy install \
|
||||
debhelper \
|
||||
build-essential \
|
||||
devscripts \
|
||||
git \
|
||||
cmake \
|
||||
clang-3.5 && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Use clang as c++ compiler
|
||||
RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100
|
||||
RUN update-alternatives --set c++ /usr/bin/clang++-3.5
|
||||
|
||||
# Setup User to match Host User, and give superuser permissions
|
||||
ARG USER_ID=0
|
||||
RUN useradd -m code_executor -u ${USER_ID} -g sudo
|
||||
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
# With the User Change, we need to change permissions on these directories
|
||||
RUN chmod -R a+rwx /usr/local
|
||||
RUN chmod -R a+rwx /home
|
||||
RUN chmod -R 755 /usr/lib/sudo
|
||||
|
||||
# Set user to the one we just created
|
||||
USER ${USER_ID}
|
||||
|
||||
# Set working directory
|
||||
WORKDIR /opt/code
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using NuGet.Frameworks;
|
||||
using NuGet.ProjectModel;
|
||||
|
||||
namespace Microsoft.DotNet.Cli.Utils
|
||||
|
|
@ -22,6 +23,8 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
|
||||
string FullOutputPath { get; }
|
||||
|
||||
NuGetFramework DotnetCliToolTargetFramework { get; }
|
||||
|
||||
Dictionary<string, string> EnvironmentVariables { get; }
|
||||
}
|
||||
}
|
||||
|
|
@ -13,6 +13,8 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
{
|
||||
internal class MSBuildProject : IProject
|
||||
{
|
||||
private static readonly NuGetFramework s_toolPackageFramework = FrameworkConstants.CommonFrameworks.NetCoreApp10;
|
||||
|
||||
private Project _project;
|
||||
|
||||
private string _projectRoot;
|
||||
|
|
@ -60,6 +62,25 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
}
|
||||
}
|
||||
|
||||
public NuGetFramework DotnetCliToolTargetFramework
|
||||
{
|
||||
get
|
||||
{
|
||||
var frameworkString = _project
|
||||
.AllEvaluatedProperties
|
||||
.FirstOrDefault(p => p.Name.Equals("DotnetCliToolTargetFramework"))
|
||||
?.EvaluatedValue;
|
||||
|
||||
if (string.IsNullOrEmpty(frameworkString))
|
||||
{
|
||||
return s_toolPackageFramework;
|
||||
}
|
||||
|
||||
return NuGetFramework.Parse(frameworkString);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public Dictionary<string, string> EnvironmentVariables
|
||||
{
|
||||
get
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
{
|
||||
private const string ProjectToolsCommandResolverName = "projecttoolscommandresolver";
|
||||
|
||||
private static readonly NuGetFramework s_toolPackageFramework = FrameworkConstants.CommonFrameworks.NetCoreApp10;
|
||||
|
||||
private static readonly CommandResolutionStrategy s_commandResolutionStrategy =
|
||||
CommandResolutionStrategy.ProjectToolsPackage;
|
||||
|
||||
|
|
@ -133,8 +131,14 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
ProjectToolsCommandResolverName,
|
||||
string.Join(Environment.NewLine, possiblePackageRoots.Select((p) => $"- {p}"))));
|
||||
|
||||
var toolPackageFramework = project.DotnetCliToolTargetFramework;
|
||||
|
||||
string nugetPackagesRoot;
|
||||
var toolLockFile = GetToolLockFile(toolLibraryRange, possiblePackageRoots, out nugetPackagesRoot);
|
||||
var toolLockFile = GetToolLockFile(
|
||||
toolLibraryRange,
|
||||
toolPackageFramework,
|
||||
possiblePackageRoots,
|
||||
out nugetPackagesRoot);
|
||||
|
||||
if (toolLockFile == null)
|
||||
{
|
||||
|
|
@ -147,7 +151,7 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
toolLockFile.Path));
|
||||
|
||||
var toolLibrary = toolLockFile.Targets
|
||||
.FirstOrDefault(t => s_toolPackageFramework == t.TargetFramework)
|
||||
.FirstOrDefault(t => toolPackageFramework == t.TargetFramework)
|
||||
?.Libraries.FirstOrDefault(
|
||||
l => StringComparer.OrdinalIgnoreCase.Equals(l.Name, toolLibraryRange.Name));
|
||||
if (toolLibrary == null)
|
||||
|
|
@ -161,7 +165,11 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
|
||||
var depsFileRoot = Path.GetDirectoryName(toolLockFile.Path);
|
||||
|
||||
var depsFilePath = GetToolDepsFilePath(toolLibraryRange, toolLockFile, depsFileRoot);
|
||||
var depsFilePath = GetToolDepsFilePath(
|
||||
toolLibraryRange,
|
||||
toolPackageFramework,
|
||||
toolLockFile,
|
||||
depsFileRoot);
|
||||
|
||||
var normalizedNugetPackagesRoot = PathUtility.EnsureNoTrailingDirectorySeparator(nugetPackagesRoot);
|
||||
|
||||
|
|
@ -203,12 +211,13 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
|
||||
private LockFile GetToolLockFile(
|
||||
SingleProjectInfo toolLibrary,
|
||||
NuGetFramework framework,
|
||||
IEnumerable<string> possibleNugetPackagesRoot,
|
||||
out string nugetPackagesRoot)
|
||||
{
|
||||
foreach (var packagesRoot in possibleNugetPackagesRoot)
|
||||
{
|
||||
if (TryGetToolLockFile(toolLibrary, packagesRoot, out LockFile lockFile))
|
||||
if (TryGetToolLockFile(toolLibrary, framework, packagesRoot, out LockFile lockFile))
|
||||
{
|
||||
nugetPackagesRoot = packagesRoot;
|
||||
return lockFile;
|
||||
|
|
@ -221,11 +230,12 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
|
||||
private bool TryGetToolLockFile(
|
||||
SingleProjectInfo toolLibrary,
|
||||
NuGetFramework framework,
|
||||
string nugetPackagesRoot,
|
||||
out LockFile lockFile)
|
||||
{
|
||||
lockFile = null;
|
||||
var lockFilePath = GetToolLockFilePath(toolLibrary, nugetPackagesRoot);
|
||||
var lockFilePath = GetToolLockFilePath(toolLibrary, framework, nugetPackagesRoot);
|
||||
|
||||
if (!File.Exists(lockFilePath))
|
||||
{
|
||||
|
|
@ -248,6 +258,7 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
|
||||
private string GetToolLockFilePath(
|
||||
SingleProjectInfo toolLibrary,
|
||||
NuGetFramework framework,
|
||||
string nugetPackagesRoot)
|
||||
{
|
||||
var toolPathCalculator = new ToolPathCalculator(nugetPackagesRoot);
|
||||
|
|
@ -255,11 +266,12 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
return toolPathCalculator.GetBestLockFilePath(
|
||||
toolLibrary.Name,
|
||||
VersionRange.Parse(toolLibrary.Version),
|
||||
s_toolPackageFramework);
|
||||
framework);
|
||||
}
|
||||
|
||||
private string GetToolDepsFilePath(
|
||||
SingleProjectInfo toolLibrary,
|
||||
NuGetFramework framework,
|
||||
LockFile toolLockFile,
|
||||
string depsPathRoot)
|
||||
{
|
||||
|
|
@ -272,24 +284,26 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
ProjectToolsCommandResolverName,
|
||||
depsJsonPath));
|
||||
|
||||
EnsureToolJsonDepsFileExists(toolLockFile, depsJsonPath, toolLibrary);
|
||||
EnsureToolJsonDepsFileExists(toolLockFile, framework, depsJsonPath, toolLibrary);
|
||||
|
||||
return depsJsonPath;
|
||||
}
|
||||
|
||||
private void EnsureToolJsonDepsFileExists(
|
||||
LockFile toolLockFile,
|
||||
NuGetFramework framework,
|
||||
string depsPath,
|
||||
SingleProjectInfo toolLibrary)
|
||||
{
|
||||
if (!File.Exists(depsPath))
|
||||
{
|
||||
GenerateDepsJsonFile(toolLockFile, depsPath, toolLibrary);
|
||||
GenerateDepsJsonFile(toolLockFile, framework, depsPath, toolLibrary);
|
||||
}
|
||||
}
|
||||
|
||||
internal void GenerateDepsJsonFile(
|
||||
LockFile toolLockFile,
|
||||
NuGetFramework framework,
|
||||
string depsPath,
|
||||
SingleProjectInfo toolLibrary)
|
||||
{
|
||||
|
|
@ -298,7 +312,7 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
depsPath));
|
||||
|
||||
var dependencyContext = new DepsJsonBuilder()
|
||||
.Build(toolLibrary, null, toolLockFile, s_toolPackageFramework, null);
|
||||
.Build(toolLibrary, null, toolLockFile, framework, null);
|
||||
|
||||
var tempDepsFile = Path.GetTempFileName();
|
||||
using (var fileStream = File.Open(tempDepsFile, FileMode.Open, FileAccess.Write))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
|
||||
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" />
|
||||
|
||||
<PropertyGroup>
|
||||
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
|
|
@ -36,7 +37,16 @@
|
|||
<ProjectReference Include="..\tool_msbuild\tool_msbuild.csproj" />
|
||||
<ProjectReference Include="..\tool_nuget\tool_nuget.csproj" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="RetargetVSTestConsole"
|
||||
AfterTargets="Publish">
|
||||
<PropertyGroup>
|
||||
<VSTestRuntimeConfigPath>$(PublishDir)/vstest.console.runtimeconfig.json</VSTestRuntimeConfigPath>
|
||||
</PropertyGroup>
|
||||
<ReplaceFileContents
|
||||
InputFile="$(VSTestRuntimeConfigPath)"
|
||||
DestinationFile="$(VSTestRuntimeConfigPath)"
|
||||
ReplacementPatterns="1.0.0"
|
||||
ReplacementStrings="1.1.0" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
|
|||
{
|
||||
string projectDirectory = directory.Path;
|
||||
|
||||
string newArgs = "console --debug:ephemeral-hive";
|
||||
string newArgs = "console -f netcoreapp1.1 --debug:ephemeral-hive";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(projectDirectory)
|
||||
.Execute(newArgs)
|
||||
|
|
@ -112,7 +112,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
|
|||
new DotnetCommand()
|
||||
.WithWorkingDirectory(testProjectDirectory)
|
||||
.ExecuteWithCapturedOutput(
|
||||
$"-d dependency-tool-invoker -c {configuration} -f netcoreapp1.0 portable")
|
||||
$"-d dependency-tool-invoker -c {configuration} -f netcoreapp1.1 portable")
|
||||
.Should().Pass()
|
||||
.And.HaveStdOutContaining("Hello Portable World!");;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
|||
.Should().Pass();
|
||||
|
||||
var factory = new ProjectDependenciesCommandFactory(
|
||||
FrameworkConstants.CommonFrameworks.NetCoreApp10,
|
||||
FrameworkConstants.CommonFrameworks.NetCoreApp11,
|
||||
configuration,
|
||||
null,
|
||||
null,
|
||||
|
|
@ -210,7 +210,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
|||
var command = factory.Create("dotnet-tool-with-output-name", null);
|
||||
|
||||
command.CommandArgs.Should().Contain(
|
||||
Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp1.0", "dotnet-tool-with-output-name.dll"));
|
||||
Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp1.1", "dotnet-tool-with-output-name.dll"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
|||
CommandName = "dotnet-portable",
|
||||
Configuration = "Debug",
|
||||
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
|
||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
|
||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp11
|
||||
};
|
||||
|
||||
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
|
||||
|
|
@ -83,7 +83,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
|||
CommandName = "dotnet-portable",
|
||||
Configuration = "Debug",
|
||||
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
|
||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
|
||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp11
|
||||
};
|
||||
|
||||
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
|
||||
|
|
@ -109,7 +109,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
|||
CommandName = "nonexistent-command",
|
||||
CommandArguments = null,
|
||||
ProjectDirectory = MSBuildTestProjectInstance.Root.FullName,
|
||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10
|
||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp11
|
||||
};
|
||||
|
||||
var result = projectDependenciesCommandResolver.Resolve(commandResolverArguments);
|
||||
|
|
@ -135,7 +135,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
|
|||
CommandName = "dotnet-portable",
|
||||
Configuration = "Debug",
|
||||
ProjectDirectory = testInstance.Root.FullName,
|
||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp10,
|
||||
Framework = FrameworkConstants.CommonFrameworks.NetCoreApp11,
|
||||
OutputPath = outputDir.FullName
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tests
|
|||
public class GivenAProjectToolsCommandResolver : TestBase
|
||||
{
|
||||
private static readonly NuGetFramework s_toolPackageFramework =
|
||||
FrameworkConstants.CommonFrameworks.NetCoreApp10;
|
||||
FrameworkConstants.CommonFrameworks.NetCoreApp11;
|
||||
|
||||
private const string TestProjectName = "AppWithToolDependency";
|
||||
|
||||
|
|
@ -279,6 +279,7 @@ namespace Microsoft.DotNet.Tests
|
|||
var projectToolsCommandResolver = SetupProjectToolsCommandResolver();
|
||||
projectToolsCommandResolver.GenerateDepsJsonFile(
|
||||
lockFile,
|
||||
s_toolPackageFramework,
|
||||
depsJsonFile,
|
||||
new SingleProjectInfo("dotnet-portable", "1.0.0", Enumerable.Empty<ResourceAssemblyInfo>()));
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using Microsoft.DotNet.PlatformAbstractions;
|
||||
|
||||
namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||
{
|
||||
public static class EnvironmentInfo
|
||||
{
|
||||
public static bool HasSharedFramework(string framework)
|
||||
{
|
||||
if (framework == "netcoreapp1.0")
|
||||
{
|
||||
string rid = RuntimeEnvironment.GetRuntimeIdentifier();
|
||||
switch (rid)
|
||||
{
|
||||
case "fedora.24-x64":
|
||||
case "opensuse.42.1-x64":
|
||||
case "ubuntu.16.10-x64":
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
using Xunit;
|
||||
|
||||
namespace Microsoft.DotNet.Tools.Test.Utilities
|
||||
{
|
||||
public class RequiresSpecificFrameworkFactAttribute : FactAttribute
|
||||
{
|
||||
public RequiresSpecificFrameworkFactAttribute(string framework)
|
||||
{
|
||||
if (!EnvironmentInfo.HasSharedFramework(framework))
|
||||
{
|
||||
this.Skip = $"This test requires a shared framework that isn't present: {framework}";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
|
|||
|
||||
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||
|
||||
var outputDll = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp1.0")
|
||||
var outputDll = testInstance.Root.GetDirectory("bin", configuration, "netcoreapp1.1")
|
||||
.GetFile($"{testAppName}.dll");
|
||||
|
||||
var outputRunCommand = new TestCommand("dotnet");
|
||||
|
|
@ -46,7 +46,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
|
|||
string dir = "pkgs";
|
||||
string args = $"--packages {dir}";
|
||||
|
||||
string newArgs = $"console -o \"{rootPath}\" --debug:ephemeral-hive";
|
||||
string newArgs = $"console -f netcoreapp1.1 -o \"{rootPath}\" --debug:ephemeral-hive";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute(newArgs)
|
||||
|
|
@ -65,7 +65,12 @@ namespace Microsoft.DotNet.Cli.Build.Tests
|
|||
.Execute()
|
||||
.Should().Pass();
|
||||
|
||||
var outputDll = Directory.EnumerateFiles(Path.Combine(rootPath, "bin"), "*.dll", SearchOption.AllDirectories).Single();
|
||||
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||
|
||||
var outputDll = Directory.EnumerateFiles(
|
||||
Path.Combine(rootPath, "bin", configuration, "netcoreapp1.1"), "*.dll",
|
||||
SearchOption.TopDirectoryOnly)
|
||||
.Single();
|
||||
|
||||
var outputRunCommand = new TestCommand("dotnet");
|
||||
|
||||
|
|
|
|||
|
|
@ -431,6 +431,12 @@ namespace Microsoft.DotNet.Migration.Tests
|
|||
.Execute("build -c Debug")
|
||||
.Should().Pass();
|
||||
|
||||
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
|
||||
{
|
||||
// running the app requires netcoreapp1.0
|
||||
return;
|
||||
}
|
||||
|
||||
var cmd = new DotnetCommand()
|
||||
.WithWorkingDirectory(projectDirectory)
|
||||
.ExecuteWithCapturedOutput("run -c Debug");
|
||||
|
|
@ -483,6 +489,12 @@ namespace Microsoft.DotNet.Migration.Tests
|
|||
.Execute("build -c Debug")
|
||||
.Should().Pass();
|
||||
|
||||
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
|
||||
{
|
||||
// running the app requires netcoreapp1.0
|
||||
return;
|
||||
}
|
||||
|
||||
var cmd = new DotnetCommand()
|
||||
.WithWorkingDirectory(projectDirectory)
|
||||
.ExecuteWithCapturedOutput("run -c Debug");
|
||||
|
|
@ -534,6 +546,12 @@ namespace Microsoft.DotNet.Migration.Tests
|
|||
.Execute("build -c Debug")
|
||||
.Should().Pass();
|
||||
|
||||
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
|
||||
{
|
||||
// running the app requires netcoreapp1.0
|
||||
return;
|
||||
}
|
||||
|
||||
var cmd = new DotnetCommand()
|
||||
.WithWorkingDirectory(projectDirectory)
|
||||
.ExecuteWithCapturedOutput("run -c Debug");
|
||||
|
|
|
|||
|
|
@ -492,7 +492,7 @@ namespace Microsoft.DotNet.Migration.Tests
|
|||
}
|
||||
|
||||
outputsIdentical.Should().BeTrue();
|
||||
|
||||
|
||||
VerifyAllMSBuildOutputsRunnable(projectDirectory);
|
||||
}
|
||||
|
||||
|
|
@ -543,7 +543,7 @@ namespace Microsoft.DotNet.Migration.Tests
|
|||
.And.Contain("Migration failed.");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[RequiresSpecificFrameworkFact("netcoreapp1.0")]
|
||||
public void ItMigratesAndPublishesProjectsWithRuntimes()
|
||||
{
|
||||
var projectName = "PJTestAppSimple";
|
||||
|
|
@ -745,6 +745,12 @@ namespace Microsoft.DotNet.Migration.Tests
|
|||
|
||||
private void VerifyAllMSBuildOutputsRunnable(DirectoryInfo projectDirectory)
|
||||
{
|
||||
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
|
||||
{
|
||||
// running the apps requires netcoreapp1.0
|
||||
return;
|
||||
}
|
||||
|
||||
var dllFileName = Path.GetFileName(projectDirectory.FullName) + ".dll";
|
||||
|
||||
var runnableDlls = projectDirectory
|
||||
|
|
|
|||
|
|
@ -30,6 +30,13 @@ namespace Microsoft.DotNet.New.Tests
|
|||
string projectType,
|
||||
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;
|
||||
|
||||
new TestCommand("dotnet") { WorkingDirectory = rootPath }
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
|
|||
|
||||
new PublishCommand()
|
||||
.WithWorkingDirectory(testProjectDirectory)
|
||||
.Execute("--framework netcoreapp1.0")
|
||||
.Execute("--framework netcoreapp1.1")
|
||||
.Should().Pass();
|
||||
|
||||
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||
var outputDll = Path.Combine(testProjectDirectory, "bin", configuration, "netcoreapp1.0", "publish", $"{testAppName}.dll");
|
||||
var outputDll = Path.Combine(testProjectDirectory, "bin", configuration, "netcoreapp1.1", "publish", $"{testAppName}.dll");
|
||||
|
||||
new TestCommand("dotnet")
|
||||
.ExecuteWithCapturedOutput(outputDll)
|
||||
|
|
@ -56,7 +56,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
|
|||
var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier();
|
||||
|
||||
new PublishCommand()
|
||||
.WithFramework("netcoreapp1.0")
|
||||
.WithFramework("netcoreapp1.1")
|
||||
.WithRuntime(rid)
|
||||
.WithWorkingDirectory(testProjectDirectory)
|
||||
//Workaround for https://github.com/dotnet/cli/issues/4501
|
||||
|
|
@ -67,7 +67,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
|
|||
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||
|
||||
var outputProgram = testProjectDirectory
|
||||
.GetDirectory("bin", configuration, "netcoreapp1.0", rid, "publish", $"{testAppName}{Constants.ExeSuffix}")
|
||||
.GetDirectory("bin", configuration, "netcoreapp1.1", rid, "publish", $"{testAppName}{Constants.ExeSuffix}")
|
||||
.FullName;
|
||||
|
||||
new TestCommand(outputProgram)
|
||||
|
|
@ -85,7 +85,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
|
|||
string dir = "pkgs";
|
||||
string args = $"--packages {dir}";
|
||||
|
||||
string newArgs = $"console -o \"{rootPath}\"";
|
||||
string newArgs = $"console -f netcoreapp1.1 -o \"{rootPath}\"";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute(newArgs)
|
||||
|
|
@ -107,7 +107,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
|
|||
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||
|
||||
var outputProgram = rootDir
|
||||
.GetDirectory("bin", configuration, "netcoreapp1.0", "publish", $"{rootDir.Name}.dll")
|
||||
.GetDirectory("bin", configuration, "netcoreapp1.1", "publish", $"{rootDir.Name}.dll")
|
||||
.FullName;
|
||||
|
||||
new TestCommand(outputProgram)
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests
|
|||
|
||||
new RunCommand()
|
||||
.WithWorkingDirectory(testProjectDirectory)
|
||||
.ExecuteWithCapturedOutput("--framework netcoreapp1.0")
|
||||
.ExecuteWithCapturedOutput("--framework netcoreapp1.1")
|
||||
.Should().Pass()
|
||||
.And.HaveStdOutContaining("Hello World!");
|
||||
}
|
||||
|
|
@ -123,7 +123,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests
|
|||
string dir = "pkgs";
|
||||
string args = $"--packages {dir}";
|
||||
|
||||
string newArgs = $"console -o \"{rootPath}\"";
|
||||
string newArgs = $"console -f netcoreapp1.1 -o \"{rootPath}\"";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute(newArgs)
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests
|
|||
|
||||
string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
|
||||
string expectedError = Path.Combine(testProjectDirectory, "bin",
|
||||
configuration, "netcoreapp1.0", "VSTestDotNetCore.dll");
|
||||
configuration, "netcoreapp1.1", "VSTestDotNetCore.dll");
|
||||
expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found.";
|
||||
|
||||
// Call test
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ namespace Microsoft.DotNet.Cli.VSTest.Tests
|
|||
.Should().Pass();
|
||||
|
||||
var outputDll = testRoot
|
||||
.GetDirectory("bin", configuration, "netcoreapp1.0")
|
||||
.GetDirectory("bin", configuration, "netcoreapp1.1")
|
||||
.GetFile($"{testAppName}.dll");
|
||||
|
||||
var argsForVstest = $"\"{outputDll.FullName}\" {TestBase.ConsoleLoggerOutputNormal}";
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ namespace Microsoft.DotNet.Tests
|
|||
.WithSourceFiles()
|
||||
.WithRestoreFiles();
|
||||
|
||||
const string framework = ".NETCoreApp,Version=v1.0";
|
||||
const string framework = ".NETCoreApp,Version=v1.1";
|
||||
|
||||
new BuildCommand()
|
||||
.WithProjectDirectory(testInstance.Root)
|
||||
|
|
@ -289,7 +289,7 @@ namespace Microsoft.DotNet.Tests
|
|||
.WithRestoreFiles();
|
||||
|
||||
var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages)
|
||||
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.0")
|
||||
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.1")
|
||||
.GetFile("project.assets.json");
|
||||
|
||||
var stopWatch = Stopwatch.StartNew();
|
||||
|
|
@ -319,7 +319,7 @@ namespace Microsoft.DotNet.Tests
|
|||
.WithRestoreFiles();
|
||||
|
||||
var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages)
|
||||
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.0")
|
||||
.GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.1")
|
||||
.GetFile("project.assets.json");
|
||||
|
||||
var stopWatch = Stopwatch.StartNew();
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||
<OutputType>Exe</OutputType>
|
||||
<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;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;fedora.24-x64;opensuse.13.2-x64;opensuse.42.1-x64;osx.10.10-x64;rhel.7-x64</RuntimeIdentifiers>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="**\*.cs" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue