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

Picking up the latest SDK and adding back some named parameters to MigrateBuildOptionsRule for clarity.

Browse source 
Updating the tool project to use BuiltProjectOutputGroupOutput instead of content because of SDK issue https://github.com/dotnet/sdk/issues/588
This commit is contained in:
Livar Cunha 2017-01-05 09:32:20 -08:00 • committed by Livar Cunha
parent 92ee4aac26
commit 3b69588db2
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/ToolWithRandomPackageName.csproj
View file

@ -9,10 +9,9 @@
</PropertyGroup>
<ItemGroup>
<Content Include="$(OutputPath)\$(AssemblyName).runtimeconfig.json">
<Pack>true</Pack>
<PackagePath>lib\$(TargetFramework)</PackagePath>
</Content>
<BuiltProjectOutputGroupOutput Include="$(ProjectRuntimeConfigFilePath)">
<FinalOutputPath>$(ProjectRuntimeConfigFilePath)</FinalOutputPath>
</BuiltProjectOutputGroupOutput>
</ItemGroup>
<ItemGroup>

2
build/Microsoft.DotNet.Cli.DependencyVersions.props
View file

@ -2,7 +2,7 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_MSBuild_Version>15.1.0-preview-000458-02</CLI_MSBuild_Version>
<CLI_NETSDK_Version>1.0.0-alpha-20170104-3</CLI_NETSDK_Version>
<CLI_NETSDK_Version>1.0.0-alpha-20170105-1</CLI_NETSDK_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170104-1-189</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0-preview-20161227-02</CLI_TestPlatform_Version>
</PropertyGroup>

4
src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs
View file

@ -111,10 +111,10 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules
compilerOptions => compilerOptions.OutputName != null);
private IncludeContextTransform CompileFilesTransform =>
new IncludeContextTransform("Compile", false, ic => ic != null);
new IncludeContextTransform("Compile", transformMappings: false, condition: ic => ic != null);
private IncludeContextTransform EmbedFilesTransform =>
new IncludeContextTransform("EmbeddedResource", false, ic => ic != null);
new IncludeContextTransform("EmbeddedResource", transformMappings: false, condition: ic => ic != null);
private IncludeContextTransform CopyToOutputFilesTransform =>
new IncludeContextTransform("Content", transformMappings: true)