Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031
* dotnet/release/15.5: (21 commits) Manually merging some changes that git merged wrong and deleted from the 15.5 branch. Separating the 'legacy' URL construction from the 'current' URL construction methods and logic. Use temporary path for fake deps.json in test Use same build number for roslyn and F# satellites Updating Roslyn satellites and SDK versions Insert NuGet Build 4.5.0-preview2-4529 into cli Update NuGet to 4529 (signed) MSBuild 15.5.154 MSBuild 15.5.153 removed commented out config I'd meant to remove added a way to specify the asp.net template versions Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0 'NuGet.master.config' does not appear to be used. Fixed tests Update branch info to release/15.5 Updating the websdk version to 2.0.0-rel-20171010-665 Insert NuGet Build 4.5.0-preview1-4526 into cli Update DependencyVersions.props Updated version of TestPlatform to 15.5.0-preview-20170923-02 MSBuild 15.4.8 ...
This commit is contained in:
Livar Cunha
commit
e1916cc4dc
37 changed files with 276 additions and 291 deletions
|
|
@ -142,8 +142,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.TestFramew
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\redist\redist.csproj", "{098D9321-1201-4974-A75E-F58EBCD98ACF}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_nuget", "src\tool_nuget\tool_nuget.csproj", "{BE4C655A-DC54-4408-B739-743456D34111}"
|
||||
|
|
@ -678,30 +676,6 @@ Global
|
|||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|x64.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|x64.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|x86.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Debug|x86.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|x64.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|x64.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|x86.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.MinSizeRel|x86.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|x64.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.Release|x86.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
|
||||
{D82A3246-9831-4024-A9B2-1932EEF3D56F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D82A3246-9831-4024-A9B2-1932EEF3D56F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D82A3246-9831-4024-A9B2-1932EEF3D56F}.Debug|x64.ActiveCfg = Release|Any CPU
|
||||
|
|
@ -1645,7 +1619,6 @@ Global
|
|||
{570950AD-A080-4F32-980C-F50E312910DF} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
|
||||
{6592A22C-2386-4E83-A4D3-FC08075C723A} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
|
||||
{098D9321-1201-4974-A75E-F58EBCD98ACF} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
|
||||
{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
|
||||
{D82A3246-9831-4024-A9B2-1932EEF3D56F} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
|
||||
{BE4C655A-DC54-4408-B739-743456D34111} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
|
||||
{3E28672F-F4E4-44D5-AEFB-1F425DECC57E} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<clear />
|
||||
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
|
|
@ -67,7 +67,6 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/
|
|||
| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]<br>_see installer note below_<sup>1</sup><br>tar.gz - See **Linux x64** |
|
||||
| **RHEL 6** | [tar.gz][rhel-6-targz] - [Checksum][rhel-6-targz-checksum] |
|
||||
|
||||
|
||||
| Latest Coherent Build<sup>2</sup><br>*master* |
|
||||
|:------:|
|
||||
| [![][coherent-version-badge]][coherent-version] |
|
||||
|
|
|
|||
|
|
@ -29,9 +29,6 @@
|
|||
<Error Condition=" '$(MSBuildExtensionsPath)' == '' "
|
||||
Text="Expected MSBuildExtensionsPath to be set, but it is not." />
|
||||
|
||||
<Error Condition=" '$(CscToolExe)' == '' "
|
||||
Text="Expected CscToolExe to be set, but it is not." />
|
||||
|
||||
<Error Condition=" '$(MSBuildSDKsPath)' == '' "
|
||||
Text="Expected MSBuildSDKsPath to be set, but it is not." />
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,11 @@
|
|||
<BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.1" Version="$(TemplateEngineTemplate2_0Version)" />
|
||||
<BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="$(TemplateEngineTemplateVersion)" />
|
||||
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="$(TemplateEngineTemplateVersion)" />
|
||||
|
||||
<BundledTemplate Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="$(SpaTemplateVersion)" />
|
||||
|
||||
<BundledTemplate Include="Microsoft.DotNet.Web.Client.ItemTemplates" Version="$(AspnetTemplateVersion)" />
|
||||
<BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(AspnetTemplateVersion)" />
|
||||
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(AspnetTemplateVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@
|
|||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<CLI_SharedFrameworkVersion>2.1.0-preview1-25810-02</CLI_SharedFrameworkVersion>
|
||||
<CLI_MSBuild_Version>15.5.0-preview-000090-0999971</CLI_MSBuild_Version>
|
||||
<CLI_Roslyn_Version>2.3.2-beta1-61921-05</CLI_Roslyn_Version>
|
||||
<CLI_Roslyn_Satellites_Version>2.3.0-pre-20170727-1</CLI_Roslyn_Satellites_Version>
|
||||
<CLI_MSBuild_Version>15.5.0-preview-000154-1054573</CLI_MSBuild_Version>
|
||||
<CLI_Roslyn_Version>2.6.0-beta1-62126-01</CLI_Roslyn_Version>
|
||||
<CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
|
||||
<CLI_FSharp_Version>4.2.0-rc-170630-0</CLI_FSharp_Version>
|
||||
<CLI_FSharp_Satellites_Version>4.4.1-pre-20170727-1</CLI_FSharp_Satellites_Version>
|
||||
<CLI_FSharp_Version>4.2.0-rtm-170926-0</CLI_FSharp_Version>
|
||||
<CLI_Deps_Satellites_Build>pre-20171012-1</CLI_Deps_Satellites_Build>
|
||||
<CLI_Roslyn_Satellites_Version>2.6.0-$(CLI_Deps_Satellites_Build)</CLI_Roslyn_Satellites_Version>
|
||||
<CLI_FSharp_Satellites_Version>4.4.1-$(CLI_Deps_Satellites_Build)</CLI_FSharp_Satellites_Version>
|
||||
|
||||
<!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
|
||||
cases, so use separate properties but derive one from the other unless we want to
|
||||
|
|
@ -15,16 +16,17 @@
|
|||
<CLI_NETSDK_Version>2.1.0-preview1-20171006-4</CLI_NETSDK_Version>
|
||||
<CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
|
||||
|
||||
<CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>
|
||||
<CLI_NuGet_Version>4.5.0-preview2-4529</CLI_NuGet_Version>
|
||||
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
|
||||
<CLI_WEBSDK_Version>2.0.0-rel-20170908-653</CLI_WEBSDK_Version>
|
||||
<CLI_TestPlatform_Version>15.5.0-preview-20170923-02</CLI_TestPlatform_Version>
|
||||
<CLI_WEBSDK_Version>2.0.0-rel-20171010-665</CLI_WEBSDK_Version>
|
||||
<CLI_TestPlatform_Version>15.5.0-preview-20171009-10</CLI_TestPlatform_Version>
|
||||
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
|
||||
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
|
||||
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
|
||||
<TemplateEngineVersion>1.0.0-beta2-20170828-305</TemplateEngineVersion>
|
||||
<TemplateEngineTemplateVersion>1.0.0-beta2-20170828-305</TemplateEngineTemplateVersion>
|
||||
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170828-305</TemplateEngineTemplate2_0Version>
|
||||
<TemplateEngineVersion>1.0.0-beta2-20171004-309</TemplateEngineVersion>
|
||||
<TemplateEngineTemplateVersion>1.0.0-beta2-20171004-309</TemplateEngineTemplateVersion>
|
||||
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20171004-309</TemplateEngineTemplate2_0Version>
|
||||
<AspnetTemplateVersion>1.0.0-beta2-20171004-309</AspnetTemplateVersion>
|
||||
<PlatformAbstractionsVersion>2.1.0-preview1-25810-02</PlatformAbstractionsVersion>
|
||||
<DependencyModelVersion>2.1.0-preview1-25810-02</DependencyModelVersion>
|
||||
<CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(CLIBuildDll)" />
|
||||
<UsingTask TaskName="AddToDeps" AssemblyFile="$(CLIBuildDll)" />
|
||||
<UsingTask TaskName="ChangeEntryPointLibraryName" AssemblyFile="$(CLIBuildDll)" />
|
||||
<UsingTask TaskName="CheckIfAllBuildsHavePublished" AssemblyFile="$(CLIBuildDll)" />
|
||||
<UsingTask TaskName="ChMod" AssemblyFile="$(CLIBuildDll)" />
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
<PropertyGroup>
|
||||
<MSBuildExtensionsPathInToolPath>false</MSBuildExtensionsPathInToolPath>
|
||||
<MSBuildExtensionsPathInToolPath Condition="$(MSBuildExtensionsPath.StartsWith('$(NormalizedToolPath)'))">true</MSBuildExtensionsPathInToolPath>
|
||||
<CscToolExeInToolPath>false</CscToolExeInToolPath>
|
||||
<CscToolExeInToolPath Condition="$(CscToolExe.StartsWith('$(NormalizedToolPath)'))">true</CscToolExeInToolPath>
|
||||
<MSBuildSDKsPathInToolPath>false</MSBuildSDKsPathInToolPath>
|
||||
<MSBuildSDKsPathInToolPath Condition="$(MSBuildSDKsPath.StartsWith('$(NormalizedToolPath)'))">true</MSBuildSDKsPathInToolPath>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
67
build_projects/dotnet-cli-build/AddToDeps.cs
Normal file
67
build_projects/dotnet-cli-build/AddToDeps.cs
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
// 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 System.IO;
|
||||
using System.Linq;
|
||||
|
||||
using Microsoft.Build.Framework;
|
||||
using Microsoft.Build.Utilities;
|
||||
using Microsoft.Extensions.DependencyModel;
|
||||
|
||||
namespace Microsoft.DotNet.Cli.Build
|
||||
{
|
||||
/// <summary>
|
||||
/// Merges additional .deps.json files into target .deps.json files.
|
||||
/// </summary>
|
||||
public class AddToDeps : Task
|
||||
{
|
||||
/// <summary>
|
||||
/// Paths to target .deps.json files, into which <see cref="AdditionalDeps" /> will be merged.
|
||||
/// These files will be overwritten with the merge result.
|
||||
/// </summary>
|
||||
[Required]
|
||||
public string[] TargetDeps { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Paths to additional .deps.json files to merge into <see cref="TargetDeps" />.
|
||||
/// </summary>
|
||||
[Required]
|
||||
public string[] AdditionalDeps { get; set; }
|
||||
|
||||
public override bool Execute()
|
||||
{
|
||||
DependencyContext additionalContext = Read(AdditionalDeps.First());
|
||||
|
||||
foreach (string additionalPath in AdditionalDeps.Skip(1))
|
||||
{
|
||||
additionalContext = additionalContext.Merge(Read(additionalPath));
|
||||
}
|
||||
|
||||
foreach (string targetPath in TargetDeps)
|
||||
{
|
||||
DependencyContext targetContext = Read(targetPath).Merge(additionalContext);
|
||||
Write(targetContext, targetPath);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private static DependencyContext Read(string path)
|
||||
{
|
||||
using (FileStream stream = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read))
|
||||
using (var reader = new DependencyContextJsonReader())
|
||||
{
|
||||
return reader.Read(stream);
|
||||
}
|
||||
}
|
||||
|
||||
private static void Write(DependencyContext context, string path)
|
||||
{
|
||||
using (FileStream stream = File.Open(path, FileMode.Create, FileAccess.Write, FileShare.Read))
|
||||
{
|
||||
var writer = new DependencyContextWriter(); // unlike reader, writer is not disposable
|
||||
writer.Write(context, stream);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -29,5 +29,6 @@
|
|||
<PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" />
|
||||
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.0.0" />
|
||||
<PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
54
scripts/obtain/dotnet-install.sh
vendored
54
scripts/obtain/dotnet-install.sh
vendored
|
|
@ -58,7 +58,7 @@ say_verbose() {
|
|||
# This platform list is finite - if the SDK/Runtime has supported Linux distribution-specific assets,
|
||||
# then and only then should the Linux distribution appear in this list.
|
||||
# Adding a Linux distribution to this list does not imply distribution-specific support.
|
||||
get_os_download_name_from_platform() {
|
||||
get_legacy_os_name_from_platform() {
|
||||
eval $invocation
|
||||
|
||||
platform="$1"
|
||||
|
|
@ -87,10 +87,6 @@ get_os_download_name_from_platform() {
|
|||
echo "opensuse.42.1"
|
||||
return 0
|
||||
;;
|
||||
"rhel.6"*)
|
||||
echo "rhel.6"
|
||||
return 0
|
||||
;;
|
||||
"rhel.7"*)
|
||||
echo "rhel"
|
||||
return 0
|
||||
|
|
@ -115,6 +111,30 @@ get_os_download_name_from_platform() {
|
|||
return 1
|
||||
}
|
||||
|
||||
get_linux_platform_name() {
|
||||
eval $invocation
|
||||
|
||||
if [ -n "$runtime_id" ]; then
|
||||
echo "${runtime_id%-*}"
|
||||
return 0
|
||||
else
|
||||
if [ -e /etc/os-release ]; then
|
||||
. /etc/os-release
|
||||
echo "$ID.$VERSION_ID"
|
||||
return 0
|
||||
elif [ -e /etc/redhat-release ]; then
|
||||
local redhatRelease=$(</etc/redhat-release)
|
||||
if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
|
||||
echo "rhel.6"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
say_verbose "Linux specific platform name and version could not be detected: $ID.$VERSION_ID"
|
||||
return 1
|
||||
}
|
||||
|
||||
get_current_os_name() {
|
||||
eval $invocation
|
||||
|
||||
|
|
@ -123,11 +143,11 @@ get_current_os_name() {
|
|||
echo "osx"
|
||||
return 0
|
||||
elif [ "$uname" = "Linux" ]; then
|
||||
local distro_specific_osname
|
||||
distro_specific_osname=$(get_distro_specific_os_name) || return 1
|
||||
local linux_platform_name
|
||||
linux_platform_name="$(get_linux_platform_name)" || { echo "linux" && return 0 ; }
|
||||
|
||||
if [ "$distro_specific_osname" = "rhel.6" ]; then
|
||||
echo $distro_specific_osname
|
||||
if [[ $linux_platform_name == "rhel.6"* ]]; then
|
||||
echo "rhel.6"
|
||||
return 0
|
||||
else
|
||||
echo "linux"
|
||||
|
|
@ -139,7 +159,7 @@ get_current_os_name() {
|
|||
return 1
|
||||
}
|
||||
|
||||
get_distro_specific_os_name() {
|
||||
get_legacy_os_name() {
|
||||
eval $invocation
|
||||
|
||||
local uname=$(uname)
|
||||
|
|
@ -147,22 +167,16 @@ get_distro_specific_os_name() {
|
|||
echo "osx"
|
||||
return 0
|
||||
elif [ -n "$runtime_id" ]; then
|
||||
echo $(get_os_download_name_from_platform "${runtime_id%-*}" || echo "${runtime_id%-*}")
|
||||
echo $(get_legacy_os_name_from_platform "${runtime_id%-*}" || echo "${runtime_id%-*}")
|
||||
return 0
|
||||
else
|
||||
if [ -e /etc/os-release ]; then
|
||||
. /etc/os-release
|
||||
os=$(get_os_download_name_from_platform "$ID.$VERSION_ID" || echo "")
|
||||
os=$(get_legacy_os_name_from_platform "$ID.$VERSION_ID" || echo "")
|
||||
if [ -n "$os" ]; then
|
||||
echo "$os"
|
||||
return 0
|
||||
fi
|
||||
elif [ -e /etc/redhat-release ]; then
|
||||
local redhatRelease=$(</etc/redhat-release)
|
||||
if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
|
||||
echo "rhel.6"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -203,7 +217,7 @@ check_pre_reqs() {
|
|||
fi
|
||||
|
||||
if [ "$(uname)" = "Linux" ]; then
|
||||
if ! [ -x "$(command -v ldconfig)" ]; then
|
||||
if [ ! -x "$(command -v ldconfig)" ]; then
|
||||
echo "ldconfig is not in PATH, trying /sbin/ldconfig."
|
||||
LDCONFIG_COMMAND="/sbin/ldconfig"
|
||||
else
|
||||
|
|
@ -457,7 +471,7 @@ construct_legacy_download_link() {
|
|||
local specific_version="${4//[$'\t\r\n']}"
|
||||
|
||||
local distro_specific_osname
|
||||
distro_specific_osname="$(get_distro_specific_os_name)" || return 1
|
||||
distro_specific_osname="$(get_legacy_os_name)" || return 1
|
||||
|
||||
local legacy_download_link=null
|
||||
if [ "$shared_runtime" = true ]; then
|
||||
|
|
|
|||
|
|
@ -23,9 +23,8 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
new Dictionary<string, string>
|
||||
{
|
||||
{ "MSBuildExtensionsPath", AppContext.BaseDirectory },
|
||||
{ "CscToolExe", GetRunCscPath() },
|
||||
{ "VbcToolExe", GetRunVbcPath() },
|
||||
{ "MSBuildSDKsPath", GetMSBuildSDKsPath() }
|
||||
{ "MSBuildSDKsPath", GetMSBuildSDKsPath() },
|
||||
{ "DOTNET_HOST_PATH", GetDotnetPath() },
|
||||
};
|
||||
|
||||
private readonly IEnumerable<string> _msbuildRequiredParameters =
|
||||
|
|
@ -78,20 +77,9 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
SdksDirectoryName);
|
||||
}
|
||||
|
||||
private static string GetRunVbcPath()
|
||||
private static string GetDotnetPath()
|
||||
{
|
||||
return GetRunToolPath("Vbc");
|
||||
}
|
||||
|
||||
private static string GetRunCscPath()
|
||||
{
|
||||
return GetRunToolPath("Csc");
|
||||
}
|
||||
|
||||
private static string GetRunToolPath(string compilerName)
|
||||
{
|
||||
var scriptExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".cmd" : ".sh";
|
||||
return Path.Combine(AppContext.BaseDirectory, "Roslyn", $"Run{compilerName}{scriptExtension}");
|
||||
return new Muxer().MuxerPath;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ The current {1} is '{2}'.</value>
|
|||
<value>Using launch settings from {0}...</value>
|
||||
</data>
|
||||
<data name="LaunchProfileIsNotAJsonObject" xml:space="preserve">
|
||||
<value>Launch profile is not a JSON object.</value>
|
||||
<value>A profile with the specified name could not be found or is not a valid JSON object.</value>
|
||||
</data>
|
||||
<data name="LaunchProfileHandlerCannotBeLocated" xml:space="preserve">
|
||||
<value>The launch profile type '{0}' is not supported.</value>
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ Aktuální {1} je {2}.</target>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">Profil spuštění není objektem JSON.</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">Profil spuštění není objektem JSON.</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ Ein ausführbares Projekt sollte ein ausführbares TFM (z.B. netcoreapp2.0) verw
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">Das Startprofil ist kein JSON-Objekt.</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">Das Startprofil ist kein JSON-Objekt.</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ El actual {1} es "{2}".</target>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">El perfil de inicio no es un objeto JSON.</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">El perfil de inicio no es un objeto JSON.</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ Le {1} actuel est '{2}'.</target>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">Le profil de lancement n'est pas un objet JSON.</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">Le profil de lancement n'est pas un objet JSON.</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ Il valore corrente di {1} è '{2}'.</target>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">Il profilo di avvio non è un oggetto JSON.</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">Il profilo di avvio non è un oggetto JSON.</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ The current {1} is '{2}'.</source>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">起動プロファイルが JSON オブジェクトではありません。</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">起動プロファイルが JSON オブジェクトではありません。</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ The current {1} is '{2}'.</source>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">시작 프로필이 JSON 개체가 아닙니다.</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">시작 프로필이 JSON 개체가 아닙니다.</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ Bieżący element {1}: „{2}”.</target>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">Profil uruchamiania nie jest obiektem JSON.</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">Profil uruchamiania nie jest obiektem JSON.</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ O {1} atual é '{2}'.</target>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">O perfil de inicialização não é um objeto JSON.</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">O perfil de inicialização não é um objeto JSON.</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ The current {1} is '{2}'.</source>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">Профиль запуска не является объектом JSON.</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">Профиль запуска не является объектом JSON.</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ Geçerli {1}: '{2}'.</target>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">Başlatma profili bir JSON nesnesi değil.</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">Başlatma profili bir JSON nesnesi değil.</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ The current {1} is '{2}'.</source>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">启动配置文件不是 JSON 对象。</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">启动配置文件不是 JSON 对象。</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ The current {1} is '{2}'.</source>
|
|||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileIsNotAJsonObject">
|
||||
<source>Launch profile is not a JSON object.</source>
|
||||
<target state="translated">啟動設定檔並非 JSON 物件。</target>
|
||||
<source>A profile with the specified name could not be found or is not a valid JSON object.</source>
|
||||
<target state="needs-review-translation">啟動設定檔並非 JSON 物件。</target>
|
||||
<note />
|
||||
</trans-unit>
|
||||
<trans-unit id="LaunchProfileHandlerCannotBeLocated">
|
||||
|
|
|
|||
|
|
@ -16,15 +16,13 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
|
||||
<PackageReference Include="Microsoft.Build.Runtime" Version="$(CLI_MSBuild_Version)" />
|
||||
<PackageReference Include="NuGet.Build.Tasks" Version="$(CLI_NuGet_Version)" />
|
||||
<PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(CLI_TestPlatform_Version)" />
|
||||
<PackageReference Include="Microsoft.TestPlatform.Build" Version="$(CLI_TestPlatform_Version)" />
|
||||
<PackageReference Include="NuGet.ProjectModel" Version="$(CLI_NuGet_Version)" />
|
||||
<!-- The project json migration commands depend on an older version of Roslyn.
|
||||
Lift the version here to match what tool_roslyn depends on (otherwise an older version will
|
||||
be added to the TPA when we crossgen and we won't be able to crossgen tool_roslyn -->
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CLI_Roslyn_Version)" />
|
||||
<PackageReference Include="Microsoft.NETCore.Compilers" Version="$(CLI_Roslyn_Version)">
|
||||
<ExcludeAssets>All</ExcludeAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -72,9 +70,33 @@
|
|||
<Target Name="PublishRoslyn"
|
||||
BeforeTargets="Publish">
|
||||
|
||||
<DotNetPublish ToolPath="$(PreviousStageDirectory)"
|
||||
Configuration="$(Configuration)"
|
||||
ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" />
|
||||
<ItemGroup>
|
||||
<RoslynBits Include="$(NuGetPackagesDir)/microsoft.netcore.compilers/$(CLI_Roslyn_Version)/tools/**/*" />
|
||||
</ItemGroup>
|
||||
<Copy SourceFiles="@(RoslynBits)" DestinationFiles="@(RoslynBits->'$(RoslynDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<Copy SourceFiles="@(RoslynSatelliteBits)" DestinationFiles="@(RoslynSatelliteBits->'$(RoslynDirectory)/bincore/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||
<ItemGroup>
|
||||
<RoslynRuntimeConfigs Include="$(RoslynDirectory)/bincore/csc.runtimeconfig.json" />
|
||||
<RoslynRuntimeConfigs Include="$(RoslynDirectory)/bincore/vbc.runtimeconfig.json" />
|
||||
<RoslynDeps Include="$(RoslynDirectory)/bincore/csc.deps.json" />
|
||||
<RoslynDeps Include="$(RoslynDirectory)/bincore/vbc.deps.json" />
|
||||
<RoslynSatelliteDeps Include="$(RoslynDirectory)/bincore/tool_roslyn_satellites.deps.json" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<ReplacementPattern>"version": ".*"</ReplacementPattern>
|
||||
<ReplacementString>"version": "$(CLI_SharedFrameworkVersion)"</ReplacementString>
|
||||
</PropertyGroup>
|
||||
<ReplaceFileContents
|
||||
InputFile="%(RoslynRuntimeConfigs.Identity)"
|
||||
DestinationFile="%(RoslynRuntimeConfigs.Identity)"
|
||||
ReplacementPatterns="$(ReplacementPattern)"
|
||||
ReplacementStrings="$(ReplacementString)" />
|
||||
<DotNetPublish
|
||||
ToolPath="$(Stage0Directory)"
|
||||
Configuration="$(Configuration)"
|
||||
ProjectPath="$(SrcDirectory)/tool_roslyn_satellites/tool_roslyn_satellites.csproj" />
|
||||
<AddToDeps TargetDeps="@(RoslynDeps)" AdditionalDeps="@(RoslynSatelliteDeps)" />
|
||||
<Delete Files="@(RoslynSatelliteDeps)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="PublishFSharp"
|
||||
|
|
@ -198,42 +220,72 @@
|
|||
Condition=" '$(DISABLE_CROSSGEN)' == '' "
|
||||
AfterTargets="PublishMSBuildExtensions">
|
||||
<ItemGroup>
|
||||
<RoslynFiles Include="$(PublishDir)Roslyn\bincore\**\*" />
|
||||
<FSharpFiles Include="$(PublishDir)FSharp\**\*" Exclude="$(PublishDir)FSharp\FSharp.Build.dll" />
|
||||
<RemainingFiles Include="$(PublishDir)**\*" Exclude="@(RoslynFiles);@(FSharpFiles)" />
|
||||
|
||||
<!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
|
||||
<SdkFiles Include="$(PublishDir)/**/*"
|
||||
Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*;$(PublishDir)/**/Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
|
||||
<RemainingFiles Remove="$(PublishDir)TestHost*\**\*" />
|
||||
<RemainingFiles Remove="$(PublishDir)Sdks\**\*" />
|
||||
|
||||
<!-- Don't try to CrossGen .NET Framework support assemblies for .NET Standard -->
|
||||
<SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />
|
||||
<RemainingFiles Remove="$(PublishDir)Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />
|
||||
|
||||
<!-- Don't try to CrossGen tasks and supporting DLLs compiled for .NET Framework -->
|
||||
<SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\tools\net*\**\*" />
|
||||
<RemainingFiles Remove="$(PublishDir)Microsoft\Microsoft.NET.Build.Extensions\tools\net*\**\*" />
|
||||
</ItemGroup>
|
||||
|
||||
<AddMetadataIsPE Items="@(SdkFiles)">
|
||||
<Output TaskParameter="ResultItems" ItemName="SdkFilesWithPEMarker" />
|
||||
<AddMetadataIsPE Items="@(RoslynFiles)">
|
||||
<Output TaskParameter="ResultItems" ItemName="RoslynFilesWithPEMarker" />
|
||||
</AddMetadataIsPE>
|
||||
<AddMetadataIsPE Items="@(FSharpFiles)">
|
||||
<Output TaskParameter="ResultItems" ItemName="FSharpFilesWithPEMarker" />
|
||||
</AddMetadataIsPE>
|
||||
<AddMetadataIsPE Items="@(RemainingFiles)">
|
||||
<Output TaskParameter="ResultItems" ItemName="RemainingFilesWithPEMarker" />
|
||||
</AddMetadataIsPE>
|
||||
|
||||
<ItemGroup>
|
||||
<CrossgenTargets Include="%(SdkFilesWithPEMarker.FullPath)" Condition=" '%(SdkFilesWithPEMarker.IsPE)' == 'True' " />
|
||||
</ItemGroup>
|
||||
<RoslynTargets Include="%(RoslynFilesWithPEMarker.FullPath)" Condition=" '%(RoslynFilesWithPEMarker.IsPE)' == 'True' " />
|
||||
<FSharpTargets Include="%(FSharpFilesWithPEMarker.FullPath)" Condition=" '%(FSharpFilesWithPEMarker.IsPE)' == 'True' " />
|
||||
<RemainingTargets Include="%(RemainingFilesWithPEMarker.FullPath)" Condition=" '%(RemainingFilesWithPEMarker.IsPE)' == 'True' " />
|
||||
|
||||
<RemoveDuplicates Inputs="@(SdkFiles->'%(RootDir)%(Directory)')">
|
||||
<Output TaskParameter="Filtered" ItemName="PublishDirSubDirectories" />
|
||||
</RemoveDuplicates>
|
||||
<RoslynFolders Include="@(RoslynTargets->DirectoryName()->Distinct())" />
|
||||
<FSharpFolders Include="@(FSharpTargets->DirectoryName()->Distinct())" />
|
||||
<RemainingFolders Include="@(RemainingTargets->DirectoryName()->Distinct())" />
|
||||
|
||||
<!-- FSharp.Build.dll causes the FSharp folder to be included. Remove it, as we don't want other FSharp dlls being included in the crossgen. -->
|
||||
<RemainingFolders Remove="$(PublishDir)FSharp\**\*" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Ensure crossgen tool is executable. See https://github.com/NuGet/Home/issues/4424 -->
|
||||
<Chmod Condition=" '$(OSName)' != 'win' "
|
||||
Glob="$(CrossgenPath)"
|
||||
Mode="u+x" />
|
||||
|
||||
<Crossgen SourceAssembly="%(CrossgenTargets.FullPath)"
|
||||
DestinationPath="%(CrossgenTargets.FullPath)"
|
||||
JITPath="$(LibCLRJitPath)"
|
||||
CrossgenPath="$(CrossgenPath)"
|
||||
ReadyToRun="True"
|
||||
PlatformAssemblyPaths="@(PlatformAssemblies);
|
||||
@(PublishDirSubDirectories);
|
||||
$(SharedFrameworkNameVersionPath)" />
|
||||
<Crossgen
|
||||
SourceAssembly="%(RoslynTargets.FullPath)"
|
||||
DestinationPath="%(RoslynTargets.FullPath)"
|
||||
JITPath="$(LibCLRJitPath)"
|
||||
CrossgenPath="$(CrossgenPath)"
|
||||
ReadyToRun="True"
|
||||
PlatformAssemblyPaths="@(PlatformAssemblies);@(RoslynFolders);$(SharedFrameworkNameVersionPath)" />
|
||||
|
||||
<Crossgen
|
||||
SourceAssembly="%(FSharpTargets.FullPath)"
|
||||
DestinationPath="%(FSharpTargets.FullPath)"
|
||||
JITPath="$(LibCLRJitPath)"
|
||||
CrossgenPath="$(CrossgenPath)"
|
||||
ReadyToRun="True"
|
||||
PlatformAssemblyPaths="@(PlatformAssemblies);@(FSharpFolders);$(SharedFrameworkNameVersionPath)" />
|
||||
|
||||
<Crossgen
|
||||
SourceAssembly="%(RemainingTargets.FullPath)"
|
||||
DestinationPath="%(RemainingTargets.FullPath)"
|
||||
JITPath="$(LibCLRJitPath)"
|
||||
CrossgenPath="$(CrossgenPath)"
|
||||
ReadyToRun="True"
|
||||
PlatformAssemblyPaths="@(PlatformAssemblies);@(RemainingFolders);$(SharedFrameworkNameVersionPath)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="ChmodPublishDir"
|
||||
|
|
@ -242,8 +294,6 @@
|
|||
|
||||
<Exec Command="find $(SdkOutputDirectory) -type d -exec chmod 755 {} \;" />
|
||||
<Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" />
|
||||
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/RunCsc.sh" />
|
||||
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/Roslyn/RunVbc.sh" />
|
||||
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" />
|
||||
</Target>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
@echo off
|
||||
|
||||
REM Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
"%~dp0..\..\..\dotnet" "%~dp0csc.exe" %*
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
set -e
|
||||
|
||||
SOURCE="${BASH_SOURCE[0]}"
|
||||
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
|
||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||
SOURCE="$(readlink "$SOURCE")"
|
||||
[[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
|
||||
done
|
||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||
|
||||
"$DIR/../../../dotnet" "$DIR/csc.exe" "$@"
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
@echo off
|
||||
|
||||
REM Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
"%~dp0..\..\..\dotnet" "%~dp0vbc.exe" %*
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
set -e
|
||||
|
||||
SOURCE="${BASH_SOURCE[0]}"
|
||||
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
|
||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||
SOURCE="$(readlink "$SOURCE")"
|
||||
[[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
|
||||
done
|
||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||
|
||||
"$DIR/../../../dotnet" "$DIR/vbc.exe" "$@"
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" />
|
||||
|
||||
<PropertyGroup>
|
||||
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
||||
<TargetFramework>$(CliTargetFramework)</TargetFramework>
|
||||
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
|
||||
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||
<PublishDir>$(RoslynDirectory)</PublishDir>
|
||||
<VersionSuffix>$(CommitCount)</VersionSuffix>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CLI_Roslyn_Version)" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Build.Tasks" Version="$(CLI_Roslyn_Version)" />
|
||||
<PackageReference Include="Microsoft.Net.Compilers.netcore" Version="$(CLI_Roslyn_Version)" />
|
||||
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(CLI_DiaSymNative_Version)" Condition="'$(OSName)' == 'win'" />
|
||||
<PackageReference Include="CliDeps.Satellites.Roslyn" Version="$(CLI_Roslyn_Satellites_Version)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="RunCsc.sh;RunCsc.cmd;RunVbc.sh;RunVbc.cmd">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="MakeCscAndVbcRunnableAndMoveToPublishDir"
|
||||
AfterTargets="Publish"
|
||||
BeforeTargets="RemoveFilesAfterPublish">
|
||||
<ItemGroup>
|
||||
<AssetsToRemoveFromDeps Include="runtimes/any/native/csc.dll"
|
||||
SectionName="runtimeTargets" />
|
||||
<AssetsToRemoveFromDeps Include="runtimes/any/native/vbc.dll"
|
||||
SectionName="runtimeTargets" />
|
||||
<AssetsToRemoveFromDeps Include="tool_roslyn.dll"
|
||||
SectionName="runtime"/>
|
||||
</ItemGroup>
|
||||
|
||||
<RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"
|
||||
SectionName="%(AssetsToRemoveFromDeps.SectionName)"
|
||||
AssetPath="%(AssetsToRemoveFromDeps.Identity)" />
|
||||
|
||||
<Copy SourceFiles="$(PublishDir)/runtimes/any/native/csc.dll;
|
||||
$(PublishDir)/$(TargetName).runtimeconfig.json;
|
||||
$(PublishDir)/$(TargetName).deps.json;"
|
||||
DestinationFiles="$(PublishDir)/csc.exe;
|
||||
$(PublishDir)/csc.runtimeconfig.json;
|
||||
$(PublishDir)/csc.deps.json;" />
|
||||
|
||||
<Copy SourceFiles="$(PublishDir)/runtimes/any/native/vbc.dll;
|
||||
$(PublishDir)/$(TargetName).runtimeconfig.json;
|
||||
$(PublishDir)/$(TargetName).deps.json;"
|
||||
DestinationFiles="$(PublishDir)/vbc.exe;
|
||||
$(PublishDir)/vbc.runtimeconfig.json;
|
||||
$(PublishDir)/vbc.deps.json;" />
|
||||
</Target>
|
||||
|
||||
<Target Name="RemoveFilesAfterPublish"
|
||||
AfterTargets="Publish">
|
||||
<Delete Files="$(PublishDir)/$(TargetName).dll" />
|
||||
<Delete Files="$(PublishDir)/$(TargetName).pdb" />
|
||||
<Delete Files="$(PublishDir)/$(TargetName).runtimeconfig.json" />
|
||||
<Delete Files="$(PublishDir)/$(TargetName).deps.json" />
|
||||
</Target>
|
||||
</Project>
|
||||
34
src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
Normal file
34
src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.tasks" />
|
||||
|
||||
<PropertyGroup>
|
||||
<VersionPrefix>$(CliVersionPrefix)</VersionPrefix>
|
||||
<TargetFramework>$(CliTargetFramework)</TargetFramework>
|
||||
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
|
||||
<PublishDir>$(RoslynDirectory)/bincore</PublishDir>
|
||||
<VersionSuffix>$(CommitCount)</VersionSuffix>
|
||||
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
|
||||
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
|
||||
<CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NetCore.App" Version="$(CLI_SharedFrameworkVersion)" />
|
||||
<PackageReference Include="CliDeps.Satellites.Roslyn" Version="$(CLI_Roslyn_Satellites_Version)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="MoveBuildTasksSatellitesAndRemoveBuildOutputAsset"
|
||||
AfterTargets="Publish">
|
||||
|
||||
<RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"
|
||||
SectionName="runtime"
|
||||
AssetPath="$(TargetFileName)" />
|
||||
|
||||
<ItemGroup>
|
||||
<BuildTaskSatellites Include="$(PublishDir)/**/Microsoft.Build.Tasks.CodeAnalysis.resources.dll" />
|
||||
</ItemGroup>
|
||||
|
||||
<Move SourceFiles="@(BuildTaskSatellites)"
|
||||
DestinationFiles="@(BuildTaskSatellites->'$(PublishDir)/../%(RecursiveDir)/%(Filename)%(Extension)')" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -31,8 +31,6 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
|
|||
|
||||
[Theory]
|
||||
[InlineData("MSBuildExtensionsPath")]
|
||||
[InlineData("CscToolExe")]
|
||||
[InlineData("VbcToolExe")]
|
||||
[InlineData("MSBuildSDKsPath")]
|
||||
[InlineData("DOTNET_CLI_TELEMETRY_SESSIONID")]
|
||||
public void ItSetsEnvironmentalVariables(string envVarName)
|
||||
|
|
@ -66,28 +64,6 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
|
|||
.Exist();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItSetsCscToolExePathToValidPath()
|
||||
{
|
||||
var msbuildPath = "<msbuildpath>";
|
||||
var envVar = "CscToolExe";
|
||||
new FileInfo(new MSBuildForwardingApp(new string[0], msbuildPath)
|
||||
.GetProcessStartInfo()
|
||||
.Environment[envVar])
|
||||
.Should().NotBeNull("constructor will throw on invalid path");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItSetsVbcToolExePathToValidPath()
|
||||
{
|
||||
var msbuildPath = "<msbuildpath>";
|
||||
var envVar = "VbcToolExe";
|
||||
new FileInfo(new MSBuildForwardingApp(new string[0], msbuildPath)
|
||||
.GetProcessStartInfo()
|
||||
.Environment[envVar])
|
||||
.Should().NotBeNull("constructor will throw on invalid path");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItSetsOrIgnoresTelemetrySessionId()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ namespace Microsoft.DotNet.Cli.Test.Tests
|
|||
{
|
||||
result.StdOut
|
||||
.Should().Contain("Total tests: 3. Passed: 2. Failed: 1. Skipped: 0.", "because .NET 4.6 tests will pass")
|
||||
.And.Contain("Passed TestNamespace.VSTestTests.VSTestPassTestDesktop", "because .NET 4.6 tests will pass")
|
||||
.And.Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0.", "because netcoreapp2.1 tests will fail")
|
||||
.And.Contain("Failed TestNamespace.VSTestTests.VSTestFailTestNetCoreApp", "because netcoreapp2.1 tests will fail");
|
||||
.And.Contain("Passed VSTestPassTestDesktop", "because .NET 4.6 tests will pass")
|
||||
.And.Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0.", "because netcoreapp2.0 tests will fail")
|
||||
.And.Contain("Failed VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail");
|
||||
}
|
||||
result.ExitCode.Should().Be(1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ namespace Microsoft.DotNet.Cli.Test.Tests
|
|||
if (!DotnetUnderTest.IsLocalized())
|
||||
{
|
||||
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
|
||||
result.StdOut.Should().Contain("Passed TestNamespace.VSTestTests.VSTestPassTest");
|
||||
result.StdOut.Should().Contain("Failed TestNamespace.VSTestTests.VSTestFailTest");
|
||||
result.StdOut.Should().Contain("Passed VSTestPassTest");
|
||||
result.StdOut.Should().Contain("Failed VSTestFailTest");
|
||||
}
|
||||
|
||||
result.ExitCode.Should().Be(1);
|
||||
|
|
@ -52,8 +52,8 @@ namespace Microsoft.DotNet.Cli.Test.Tests
|
|||
if (!DotnetUnderTest.IsLocalized())
|
||||
{
|
||||
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
|
||||
result.StdOut.Should().Contain("Passed TestNamespace.VSTestTests.VSTestPassTest");
|
||||
result.StdOut.Should().Contain("Failed TestNamespace.VSTestTests.VSTestFailTest");
|
||||
result.StdOut.Should().Contain("Passed VSTestPassTest");
|
||||
result.StdOut.Should().Contain("Failed VSTestFailTest");
|
||||
}
|
||||
|
||||
result.ExitCode.Should().Be(1);
|
||||
|
|
@ -227,8 +227,8 @@ namespace Microsoft.DotNet.Cli.Test.Tests
|
|||
if (!DotnetUnderTest.IsLocalized())
|
||||
{
|
||||
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
|
||||
result.StdOut.Should().Contain("Passed TestNamespace.VSTestTests.VSTestPassTest");
|
||||
result.StdOut.Should().Contain("Failed TestNamespace.VSTestTests.VSTestFailTest");
|
||||
result.StdOut.Should().Contain("Passed VSTestPassTest");
|
||||
result.StdOut.Should().Contain("Failed VSTestFailTest");
|
||||
}
|
||||
|
||||
result.ExitCode.Should().Be(1);
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ namespace Microsoft.DotNet.Cli.VSTest.Tests
|
|||
{
|
||||
result.StdOut
|
||||
.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.")
|
||||
.And.Contain("Passed TestNamespace.VSTestTests.VSTestPassTest")
|
||||
.And.Contain("Failed TestNamespace.VSTestTests.VSTestFailTest");
|
||||
.And.Contain("Passed VSTestPassTest")
|
||||
.And.Contain("Failed VSTestFailTest");
|
||||
}
|
||||
|
||||
result.ExitCode.Should().Be(1);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue