From 794f3c6a9bc97c653248e80074d43f9668aa9ff3 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 27 Nov 2019 13:09:47 +0100 Subject: [PATCH 01/15] Converge common msbuild properties and targets Moving common msbuild properties and targets into the repo root. --- Directory.Build.props | 51 ++++++++++++++++ Directory.Build.targets | 28 +++++++++ .../System.Private.CoreLib.csproj | 3 - src/installer/Directory.Build.props | 17 ------ src/installer/Directory.Build.targets | 8 --- src/libraries/Directory.Build.props | 60 ++----------------- src/libraries/Directory.Build.targets | 22 ------- 7 files changed, 84 insertions(+), 105 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 42b9df1427b318..44bbba619f4fee 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,13 @@ + + + false + + + true + + + true + false + + + false + + + + + + latest + preview + true + + + true + + + false + + + + + $(LibrariesProjectRoot)CodeAnalysis.ruleset + false + + + + + true + true + true + + + + + true diff --git a/Directory.Build.targets b/Directory.Build.targets index 5180c31001b64c..27a66eb4ca491e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,33 @@ + + + false + + + + + + + $(DefineConstants),INTERNAL_NULLABLE_ATTRIBUTES + + + + + + + + + + $(MajorVersion).$(MinorVersion) + + \ No newline at end of file diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj index 29158971446266..b4506b5eaf1583 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -442,9 +442,6 @@ - - $(LibrariesProjectRoot)CodeAnalysis.ruleset - diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props index c26b17925b29ae..b7efc9b6483851 100644 --- a/src/installer/Directory.Build.props +++ b/src/installer/Directory.Build.props @@ -29,28 +29,13 @@ - $(MSBuildThisFileDirectory) $(InstallerProjectRoot)signing\ - $(RepoRoot)LICENSE.TXT $(ArtifactsObjDir)HostMachineInfo.props - - - core-setup - - - - - true - - Microsoft.NETCore.App .NETCoreApp @@ -121,8 +106,6 @@ false false false - - https://github.com/dotnet/core-setup diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets index ad077c9b2079f5..724a3f5557e2c1 100644 --- a/src/installer/Directory.Build.targets +++ b/src/installer/Directory.Build.targets @@ -19,14 +19,6 @@ - - - $(MajorVersion).$(MinorVersion) - - diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index dd2bcf6b76f45d..a0e5544a6baafd 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -1,25 +1,10 @@ - - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), global.json)) - $([MSBuild]::EnsureTrailingSlash('$(RepoRoot)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng')) - $(MSBuildThisFileDirectory) - git://github.com/dotnet/corefx - - true - - false - true @@ -80,11 +65,6 @@ package - - - true - - @@ -108,8 +88,6 @@ - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin')) - $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'native', '$(BuildConfiguration)')) @@ -119,16 +97,16 @@ AnyCPU - Library Open + + Properties + + + $(IsSourceProject) $(IsSourceProject) $(RepositoryEngineeringDir)DefaultGenApiDocIds.txt - - true - - Properties @@ -168,13 +146,6 @@ $(RuntimeOS)-$(ArchGroup) - - - true - true - true - - true @@ -247,23 +218,14 @@ - - latest - preview strict;nullablePublicOnly 4 true - true false - - true true - - - false @@ -332,22 +294,10 @@ $(OutputPath)$(MSBuildProjectName).xml - $(LibrariesProjectRoot)CodeAnalysis.ruleset - false - true - - - true - false - - - false - - true diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 08426497067e93..af745988d577cd 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -7,28 +7,6 @@ - - - - - - $(DefineConstants),INTERNAL_NULLABLE_ATTRIBUTES - - - - - - - - - - false - - 5.0 - Portable @@ -34,7 +32,6 @@ $(BuildType) $(BuildArch) arm - {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9} true false From f6ed6ceabc7ae2635ff47b2832d4baf329494d63 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 27 Nov 2019 18:16:11 +0100 Subject: [PATCH 03/15] Consolidate analyzers logic into the repo root Consolidating msbuild analyzers logic centrally in the repo root and adding a property switch `EnableAnalyzers` to enable analyzers. We still need to import the Analyzers.props file unconditionally as libraries currently doesn't use the PackageReference logic in ref and src projects and instead uses a depproj to create a props file dynamically. --- Directory.Build.props | 8 ++------ eng/{analyzers.props => Analyzers.props} | 5 ++++- {src/libraries => eng}/CodeAnalysis.ruleset | 0 .../System.Private.CoreLib/System.Private.CoreLib.csproj | 7 +------ src/libraries/Directory.Build.props | 5 +---- src/libraries/restore/analyzers/analyzers.depproj | 4 +--- 6 files changed, 9 insertions(+), 20 deletions(-) rename eng/{analyzers.props => Analyzers.props} (68%) rename {src/libraries => eng}/CodeAnalysis.ruleset (100%) diff --git a/Directory.Build.props b/Directory.Build.props index 44bbba619f4fee..ece46afc2643f5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -84,12 +84,6 @@ false - - - $(LibrariesProjectRoot)CodeAnalysis.ruleset - false - - true @@ -102,4 +96,6 @@ true + + diff --git a/eng/analyzers.props b/eng/Analyzers.props similarity index 68% rename from eng/analyzers.props rename to eng/Analyzers.props index 4aa6b32299134d..24d83dca9c00b5 100644 --- a/eng/analyzers.props +++ b/eng/Analyzers.props @@ -1,5 +1,8 @@ - + + $(MSBuildThisFileDirectory)CodeAnalysis.ruleset + + diff --git a/src/libraries/CodeAnalysis.ruleset b/eng/CodeAnalysis.ruleset similarity index 100% rename from src/libraries/CodeAnalysis.ruleset rename to eng/CodeAnalysis.ruleset diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj index 6910c0f0c4eb11..1ea66541dc1972 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -59,6 +59,7 @@ <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation true $(OutputPath)$(MSBuildProjectName).xml + true @@ -438,12 +439,6 @@ - - - - - - diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index a0e5544a6baafd..e0a4e1ab776f73 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -221,11 +221,10 @@ strict;nullablePublicOnly 4 true - false - true + true @@ -359,6 +358,4 @@ false true - - diff --git a/src/libraries/restore/analyzers/analyzers.depproj b/src/libraries/restore/analyzers/analyzers.depproj index ee614d52326ea4..75547d787bc67c 100644 --- a/src/libraries/restore/analyzers/analyzers.depproj +++ b/src/libraries/restore/analyzers/analyzers.depproj @@ -1,12 +1,10 @@ false + true C# - - - Date: Wed, 27 Nov 2019 18:32:27 +0100 Subject: [PATCH 04/15] Fix build break --- Directory.Build.props | 9 ++------- src/libraries/Directory.Build.props | 9 +++++++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index ece46afc2643f5..70bde9df43b84d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -84,16 +84,11 @@ false - - - true - true - true - - true + + Properties diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index e0a4e1ab776f73..6c3d9c13980910 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -99,8 +99,6 @@ AnyCPU Open - - Properties @@ -146,6 +144,13 @@ $(RuntimeOS)-$(ArchGroup) + + + true + true + true + + true From 5b2358ad07a760c32546284cfedce5b3d12d19bd Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 27 Nov 2019 19:41:25 +0100 Subject: [PATCH 05/15] PR feedback --- Directory.Build.targets | 12 ------------ .../System.Private.CoreLib.csproj | 2 +- src/libraries/Directory.Build.targets | 12 ++++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 27a66eb4ca491e..7d40eb9ac3020a 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -10,18 +10,6 @@ - - - - - $(DefineConstants),INTERNAL_NULLABLE_ATTRIBUTES - - - - - - - Portable diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index af745988d577cd..6b65645f4ff34a 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -177,4 +177,16 @@ + + + + + $(DefineConstants),INTERNAL_NULLABLE_ATTRIBUTES + + + + + + + From 75d039184966119db928f99cdba0d1bbc6a95ca7 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 27 Nov 2019 21:27:48 +0100 Subject: [PATCH 06/15] Fix build in libraries --- Directory.Build.props | 2 -- Directory.Build.targets | 2 ++ eng/Analyzers.props | 2 +- eng/restore/repoRestore.targets | 9 ++++++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 70bde9df43b84d..801d06adccd251 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -91,6 +91,4 @@ Properties - - diff --git a/Directory.Build.targets b/Directory.Build.targets index 7d40eb9ac3020a..2d9c4e8b781f1e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -18,4 +18,6 @@ $(MajorVersion).$(MinorVersion) + + \ No newline at end of file diff --git a/eng/Analyzers.props b/eng/Analyzers.props index 24d83dca9c00b5..adae226f82407d 100644 --- a/eng/Analyzers.props +++ b/eng/Analyzers.props @@ -2,7 +2,7 @@ $(MSBuildThisFileDirectory)CodeAnalysis.ruleset - + diff --git a/eng/restore/repoRestore.targets b/eng/restore/repoRestore.targets index f76976ba1f2303..b61a1f8b0e7b49 100644 --- a/eng/restore/repoRestore.targets +++ b/eng/restore/repoRestore.targets @@ -1,4 +1,4 @@ - + None @@ -18,6 +18,13 @@ $(_excludeRestorePackageImports) + + + + + + - + diff --git a/eng/restore/repoRestore.targets b/eng/restore/repoRestore.targets index b61a1f8b0e7b49..f76976ba1f2303 100644 --- a/eng/restore/repoRestore.targets +++ b/eng/restore/repoRestore.targets @@ -1,4 +1,4 @@ - + None @@ -18,13 +18,6 @@ $(_excludeRestorePackageImports) - - - - - - - true - false diff --git a/eng/illink.targets b/eng/illink.targets index 44c6adbf93c3c2..f49a6c486b3758 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -24,7 +24,7 @@ true - + $(AssemblyName).xml diff --git a/src/coreclr/src/Directory.Build.targets b/src/coreclr/src/Directory.Build.targets index 975845368610ba..d2ec773ef1d527 100644 --- a/src/coreclr/src/Directory.Build.targets +++ b/src/coreclr/src/Directory.Build.targets @@ -17,4 +17,6 @@ + + \ No newline at end of file diff --git a/src/coreclr/src/System.Private.CoreLib/ILLink.targets b/src/coreclr/src/System.Private.CoreLib/ILLink.targets deleted file mode 100644 index ccf2cbfd214fd9..00000000000000 --- a/src/coreclr/src/System.Private.CoreLib/ILLink.targets +++ /dev/null @@ -1,146 +0,0 @@ - - - - - $(TargetsTriggeredByCompilation); - ILLinkTrimAssembly - - - - - - $(PkgILLink_Tasks)/tools - $(ILLinkTasksToolsDir)/net472/ - $(ILLinkTasksToolsDir)/netcoreapp2.0/ - $(ILLinkTasksDir)ILLink.Tasks.dll - true - $(IntermediateOutputPath)$(TargetName)$(TargetExt) - $(IntermediateOutputPath)$(TargetName).pdb - $(IntermediateOutputPath)PreTrim/ - $(ILLinkTrimInputPath)$(TargetName)$(TargetExt) - $(ILLinkTrimInputPath)$(TargetName).pdb - $(IntermediateOutputPath) - - - true - - - - - - $(BinDir)ILLinkTrimAssembly/$(BuildConfiguration)/trimmed - TrimmedItem - - - $(BinDir)ILLinkTrimAssembly/$(BuildConfiguration)/reports - TrimmingReport - - - $(BinDir)ILLinkTrimAssembly/$(BuildConfiguration)/pretrimmed - PreTrimmedItem - - - - - - - - $(ILLinkArgs)-r $(TargetName) - - $(ILLinkArgs) -c skip - - $(ILLinkArgs) -u skip - - $(ILLinkArgs) -p link $(TargetName) - $(ILLinkArgs) -b true - - $(ILLinkArgs) -v true - - $(ILLinkArgs) --strip-resources false - - $(ILLinkArgs) --disable-opt unusedinterfaces - - - - - - - - - - - - - <_DotNetHostDirectory>$(NetCoreRoot) - <_DotNetHostFileName>dotnet - <_DotNetHostFileName Condition=" '$(OS)' == 'Windows_NT' ">dotnet.exe - - - - - - - - - - $(AsmDiffArgs) $(ILLinkTrimInputAssembly) - $(AsmDiffArgs) $(ILLinkTrimAssemblyPath) - $(AsmDiffArgs) -includePrivateApis -includeInternalApis -alwaysDiffMembers -diffAttributes - - $(IntermediateOutputPath)$(TargetName).diff.html - $(AsmDiffArgs) -out:$(AsmDiffReport) - $(AsmDiffReportArgs) -unchanged -changed -added -removed - - $(IntermediateOutputPath)$(TargetName).diff.csv - $(AsmDiffArgs) -out:$(AsmDiffList) - $(AsmDiffListArgs) -unchanged -changed -added -removed - $(AsmDiffListArgs) -diffWriter:CSV - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj index 5f22aa92ef37bd..d03283e381147a 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -1,4 +1,4 @@ - + false @@ -18,6 +18,10 @@ $(BinDir)IL/ Debug;Release;Checked x64;x86;arm;arm64 + + true + true + unused @@ -59,7 +63,7 @@ <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation true $(OutputPath)$(MSBuildProjectName).xml - true + false @@ -94,10 +98,6 @@ - System.Private.CoreLib - 5.0.0.0 - true - false $(AssemblyName) @@ -420,20 +420,12 @@ - true - true Windows_NT true - - - $(MSBuildProjectName) - .dll - - @@ -444,21 +436,19 @@ - - - - - - - $(MSBuildProjectName).xml - + + + + + + From 6b950a8e6eee8a94d88b785ac54e9d80a4570b4a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sat, 30 Nov 2019 22:36:55 +0100 Subject: [PATCH 10/15] Un-condition illink restore --- eng/Tools.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Tools.props b/eng/Tools.props index 2782d8c0051470..4e95163ae125b3 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -42,7 +42,7 @@ - - - + + + From 13807913a0640a1ae35e826d11dd3ecd9262fb25 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sat, 30 Nov 2019 23:07:47 +0100 Subject: [PATCH 11/15] Import condition fixes --- eng/Build.props | 4 ---- eng/Subsets.props | 8 ++++++-- src/coreclr/src/Directory.Build.targets | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index 20dbe662c83f94..5e060adde8d6b7 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -15,10 +15,6 @@ https://github.com/dotnet/arcade/issues/388 --> - - true - - - - + + + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer')) + libraries-installer-coreclr diff --git a/src/coreclr/src/Directory.Build.targets b/src/coreclr/src/Directory.Build.targets index d2ec773ef1d527..99a23759538429 100644 --- a/src/coreclr/src/Directory.Build.targets +++ b/src/coreclr/src/Directory.Build.targets @@ -17,6 +17,7 @@ - + + \ No newline at end of file From c3ee1a32c76e30858d47b45bb4999162e9162a84 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sat, 30 Nov 2019 23:51:58 +0100 Subject: [PATCH 12/15] Fix of Subsets cleanup --- Directory.Build.props | 13 ++++++------- eng/Subsets.props | 3 ++- src/installer/Directory.Build.props | 6 ------ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 7d6e451d908a67..867d863b83afff 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -28,20 +28,19 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin')) - - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'tools-local')) - $([MSBuild]::NormalizeDirectory('$(RepoToolsLocalDir)', 'tasks')) + + + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'installer.tasks')) $([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'netstandard2.0', 'installer.tasks.dll')) $([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'net46', 'installer.tasks.dll')) $(ArtifactsObjDir)HostMachineInfo.props - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs')) $([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages')) $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src')) diff --git a/eng/Subsets.props b/eng/Subsets.props index 810d0ec4dbf696..a1ca197fe66c0f 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -47,11 +47,12 @@ artifacts to the test layout, then running the test subset. --> - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'tools-local')) + $([MSBuild]::NormalizeDirectory('$(RepoToolsLocalDir)', 'tasks')) diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props index b7efc9b6483851..d6cda923cc6809 100644 --- a/src/installer/Directory.Build.props +++ b/src/installer/Directory.Build.props @@ -2,12 +2,6 @@ - - - @@ -436,12 +436,6 @@ - - - $(MSBuildProjectName).xml - - - Date: Sun, 1 Dec 2019 00:49:17 +0100 Subject: [PATCH 14/15] Allow different illink.tasks location for clr --- eng/Tools.props | 1 + eng/illink.targets | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eng/Tools.props b/eng/Tools.props index 4e95163ae125b3..7fcadc4e765fa8 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -44,5 +44,6 @@ + diff --git a/eng/illink.targets b/eng/illink.targets index 44c6adbf93c3c2..48a8eb9c50af35 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -9,8 +9,11 @@ - $(ILLinkDir)netcoreapp2.0/ILLink.Tasks.dll - $(ILLinkDir)net472/ILLink.Tasks.dll + $([MSBuild]::NormalizeDirectory('$(PkgILLink_Tasks)', 'tools')) + + $(ILLinkDir) + $(ILLinkDir)netcoreapp2.0/ILLink.Tasks.dll + $(ILLinkDir)net472/ILLink.Tasks.dll $(IntermediateOutputPath)$(TargetName)$(TargetExt) $(IntermediateOutputPath)$(TargetName).pdb $(IntermediateOutputPath)PreTrim/ From 48e7a8400de8fbb2bcfed1ce11f658d8fc1729bf Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sun, 1 Dec 2019 01:36:00 +0100 Subject: [PATCH 15/15] Simplify libraries illink infra --- eng/Tools.props | 5 +++-- eng/Versions.props | 1 - eng/illink.targets | 8 +++----- eng/restore/illink.targets | 20 -------------------- 4 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 eng/restore/illink.targets diff --git a/eng/Tools.props b/eng/Tools.props index 7fcadc4e765fa8..fa9804318e7c7d 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -23,6 +23,9 @@ + + + @@ -44,6 +47,4 @@ - - diff --git a/eng/Versions.props b/eng/Versions.props index b310637bd10ced..dd076d4ffa823c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,6 @@ false true - $([MSBuild]::NormalizeDirectory('$(ArtifactsToolsetDir)', 'ILLink')) $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs')) diff --git a/eng/illink.targets b/eng/illink.targets index 48a8eb9c50af35..924122b0e97e47 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -9,11 +9,9 @@ - $([MSBuild]::NormalizeDirectory('$(PkgILLink_Tasks)', 'tools')) - - $(ILLinkDir) - $(ILLinkDir)netcoreapp2.0/ILLink.Tasks.dll - $(ILLinkDir)net472/ILLink.Tasks.dll + $([MSBuild]::NormalizeDirectory('$(PkgILLink_Tasks)', 'tools')) + $(ILLinkTasksDir)netcoreapp2.0/ILLink.Tasks.dll + $(ILLinkTasksDir)net472/ILLink.Tasks.dll $(IntermediateOutputPath)$(TargetName)$(TargetExt) $(IntermediateOutputPath)$(TargetName).pdb $(IntermediateOutputPath)PreTrim/ diff --git a/eng/restore/illink.targets b/eng/restore/illink.targets deleted file mode 100644 index aa40e2a2a4e8b1..00000000000000 --- a/eng/restore/illink.targets +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - <_illinkSrcFiles Include="$(NuGetPackageRoot)illink.tasks\$(ILLinkTasksVersion)\tools\**\*" /> - - - - - -