Merge pull request #8607 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
This commit is contained in:
commit
0b7f66c291
5 changed files with 2 additions and 113 deletions
|
@ -9,7 +9,7 @@
|
||||||
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
|
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
|
||||||
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
|
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
|
||||||
<MicrosoftFSharpCompilerPackageVersion>10.1.2-rtm-180131-0</MicrosoftFSharpCompilerPackageVersion>
|
<MicrosoftFSharpCompilerPackageVersion>10.1.2-rtm-180131-0</MicrosoftFSharpCompilerPackageVersion>
|
||||||
<MicrosoftCodeAnalysisCSharpPackageVersion>2.7.0-beta3-62529-05</MicrosoftCodeAnalysisCSharpPackageVersion>
|
<MicrosoftCodeAnalysisCSharpPackageVersion>2.7.0-beta3-62612-07</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||||
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
||||||
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
|
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
|
||||||
<MicrosoftNETSdkPackageVersion>15.5.0-preview-62518-04</MicrosoftNETSdkPackageVersion>
|
<MicrosoftNETSdkPackageVersion>15.5.0-preview-62518-04</MicrosoftNETSdkPackageVersion>
|
||||||
|
@ -45,7 +45,6 @@
|
||||||
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
|
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
|
||||||
<XliffTasksPackageVersion>0.2.0-beta-000042</XliffTasksPackageVersion>
|
<XliffTasksPackageVersion>0.2.0-beta-000042</XliffTasksPackageVersion>
|
||||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||||
<CliDepsSatellitesRoslynPackageVersion>2.6.0-pre-20171122-1</CliDepsSatellitesRoslynPackageVersion>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- NOTE: The property group above is in alignment with orchestrated build version naming conventions. -->
|
<!-- NOTE: The property group above is in alignment with orchestrated build version naming conventions. -->
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="14.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="14.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(CLIBuildDll)" />
|
||||||
<UsingTask TaskName="AddToDeps" AssemblyFile="$(CLIBuildDll)" />
|
|
||||||
<UsingTask TaskName="ChangeEntryPointLibraryName" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="ChangeEntryPointLibraryName" AssemblyFile="$(CLIBuildDll)" />
|
||||||
<UsingTask TaskName="CheckIfAllBuildsHavePublished" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="CheckIfAllBuildsHavePublished" AssemblyFile="$(CLIBuildDll)" />
|
||||||
<UsingTask TaskName="ChMod" AssemblyFile="$(CLIBuildDll)" />
|
<UsingTask TaskName="ChMod" AssemblyFile="$(CLIBuildDll)" />
|
||||||
|
|
|
@ -1,67 +0,0 @@
|
||||||
// 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -77,13 +77,11 @@
|
||||||
<RoslynBits Include="$(NuGetPackagesDir)/microsoft.netcore.compilers/$(MicrosoftNETCoreCompilersPackageVersion)/tools/**/*" />
|
<RoslynBits Include="$(NuGetPackagesDir)/microsoft.netcore.compilers/$(MicrosoftNETCoreCompilersPackageVersion)/tools/**/*" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Copy SourceFiles="@(RoslynBits)" DestinationFiles="@(RoslynBits->'$(RoslynDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
<Copy SourceFiles="@(RoslynBits)" DestinationFiles="@(RoslynBits->'$(RoslynDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
|
||||||
<Copy SourceFiles="@(RoslynSatelliteBits)" DestinationFiles="@(RoslynSatelliteBits->'$(RoslynDirectory)/bincore/%(RecursiveDir)%(Filename)%(Extension)')" />
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<RoslynRuntimeConfigs Include="$(RoslynDirectory)/bincore/csc.runtimeconfig.json" />
|
<RoslynRuntimeConfigs Include="$(RoslynDirectory)/bincore/csc.runtimeconfig.json" />
|
||||||
<RoslynRuntimeConfigs Include="$(RoslynDirectory)/bincore/vbc.runtimeconfig.json" />
|
<RoslynRuntimeConfigs Include="$(RoslynDirectory)/bincore/vbc.runtimeconfig.json" />
|
||||||
<RoslynDeps Include="$(RoslynDirectory)/bincore/csc.deps.json" />
|
<RoslynDeps Include="$(RoslynDirectory)/bincore/csc.deps.json" />
|
||||||
<RoslynDeps Include="$(RoslynDirectory)/bincore/vbc.deps.json" />
|
<RoslynDeps Include="$(RoslynDirectory)/bincore/vbc.deps.json" />
|
||||||
<RoslynSatelliteDeps Include="$(RoslynDirectory)/bincore/tool_roslyn_satellites.deps.json" />
|
|
||||||
<RoslynFrameworkAssemblies Include="$(RoslynDirectory)/System.*.dll;$(RoslynDirectory)/runtimes/**/System.*.dll" Exclude="$(RoslynDirectory)/runtimes/**/System.IO.Pipes.AccessControl.dll"/>
|
<RoslynFrameworkAssemblies Include="$(RoslynDirectory)/System.*.dll;$(RoslynDirectory)/runtimes/**/System.*.dll" Exclude="$(RoslynDirectory)/runtimes/**/System.IO.Pipes.AccessControl.dll"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
@ -95,12 +93,7 @@
|
||||||
DestinationFile="%(RoslynRuntimeConfigs.Identity)"
|
DestinationFile="%(RoslynRuntimeConfigs.Identity)"
|
||||||
ReplacementPatterns="$(ReplacementPattern)"
|
ReplacementPatterns="$(ReplacementPattern)"
|
||||||
ReplacementStrings="$(ReplacementString)" />
|
ReplacementStrings="$(ReplacementString)" />
|
||||||
<DotNetPublish
|
<Delete Files="@(RoslynFrameworkAssemblies)" />
|
||||||
ToolPath="$(Stage0Directory)"
|
|
||||||
Configuration="$(Configuration)"
|
|
||||||
ProjectPath="$(SrcDirectory)/tool_roslyn_satellites/tool_roslyn_satellites.csproj" />
|
|
||||||
<AddToDeps TargetDeps="@(RoslynDeps)" AdditionalDeps="@(RoslynSatelliteDeps)" />
|
|
||||||
<Delete Files="@(RoslynSatelliteDeps);@(RoslynFrameworkAssemblies)" />
|
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="PublishFSharp"
|
<Target Name="PublishFSharp"
|
||||||
|
|
|
@ -1,35 +0,0 @@
|
||||||
<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>$(CliTargetFramework)</TargetFramework>
|
|
||||||
<RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</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="$(MicrosoftNETCoreAppPackageVersion)" />
|
|
||||||
<PackageReference Include="CliDeps.Satellites.Roslyn" Version="$(CliDepsSatellitesRoslynPackageVersion)" />
|
|
||||||
</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>
|
|
Loading…
Add table
Add a link
Reference in a new issue