Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Use Arcade DotNetTool and NuGetPackageRoot #37647

Merged
ViktorHofer merged 4 commits into from
May 17, 2019
Merged

Use Arcade DotNetTool and NuGetPackageRoot #37647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c39b9d8
Use Arcade props
ViktorHofer May 13, 2019
00bbeab
Use global dotnet if applicable
ViktorHofer May 13, 2019
65ee7be
Fix typo
ViktorHofer May 16, 2019
ef4c392
Remove another case of PackageDir
ViktorHofer May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,19 +114,6 @@

<!-- Use msbuild path functions as that property is used in bash scripts. -->
<SourceDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src'))</SourceDir>

<!-- Input Directories -->
<PackagesDir>$(DotNetRestorePackagesPath)</PackagesDir>
<PackagesDir Condition="'$(PackagesDir)'=='' AND '$(NuGetPackageRoot)' != ''">$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))</PackagesDir>
<PackagesDir Condition="'$(PackagesDir)'==''">$(RepoRoot).packages/</PackagesDir>
<!-- Respect environment variable for the .NET install directory if set; otherwise, use the current default location -->
<DotNetRoot Condition="'$(DotNetRoot)' == ''">$(DOTNET_INSTALL_DIR)</DotNetRoot>
<DotNetRoot Condition="'$(DotNetRoot)' == ''">$(RepoRoot).dotnet\</DotNetRoot>
<DotNetRoot Condition="!HasTrailingSlash('$(DotNetRoot)')">$(DotNetRoot)\</DotNetRoot>
<DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(DotNetRoot)</DotnetCliPath>
<ToolHostCmd Condition="'$(ToolHostCmd)'==''">"$(DotNetRoot)dotnet"</ToolHostCmd>
<DotNetCmd>$(DotNetRoot)dotnet</DotNetCmd>
<DotNetCmd Condition="'$(OS)' == 'Windows_NT'">$(DotNetCmd).exe</DotNetCmd>
</PropertyGroup>

<!-- workaround https://github.com/dotnet/sdk/issues/2288
Expand Down
2 changes: 1 addition & 1 deletion eng/Packaging.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<XmlDocPackage>Microsoft.Private.Intellisense</XmlDocPackage>
<XmlDocPackageVersion>3.0.0-preview3-190305-0</XmlDocPackageVersion>
<XmlDocFileRoot>$(PackagesDir)$(XmlDocPackage.ToLowerInvariant())/$(XmlDocPackageVersion)/xmldocs/netcoreapp</XmlDocFileRoot>
<XmlDocFileRoot>$(NuGetPackageRoot)$(XmlDocPackage.ToLowerInvariant())/$(XmlDocPackageVersion)/xmldocs/netcoreapp</XmlDocFileRoot>
<XmlDocDir>$(ArtifactsBinDir)docs</XmlDocDir>

<!-- By default the packaging targets will package desktop facades as ref,
Expand Down
13 changes: 4 additions & 9 deletions eng/Tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@

<!-- Need to keep in sync with CodeAnalysis.targets file. -->
<AnalyzerPropsFile>$(ArtifactsToolsetDir)Common\Tools.Analyzers.props</AnalyzerPropsFile>

<DotNetRoot Condition="'$(DotNetRoot)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.dotnet'))</DotNetRoot>
<DotNetCmd>$(DotNetRoot)dotnet</DotNetCmd>
<DotNetCmd Condition="'$(OS)' == 'Windows_NT'">$(DotNetCmd).exe</DotNetCmd>
<DotNetCmd>"$(DotNetCmd)"</DotNetCmd>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)dependencies.props" />
Expand Down Expand Up @@ -81,7 +76,7 @@
<OptionalToolProjectPath>$(OptionalToolDir)Tools.csproj</OptionalToolProjectPath>
</PropertyGroup>

<Exec Command="$(DotNetCmd) restore &quot;$(OptionalToolProjectPath)&quot; --interactive --ignore-failed-sources /p:TargetGroup=$(TargetGroup)"
<Exec Command="&quot;$(DotNetTool)&quot; restore &quot;$(OptionalToolProjectPath)&quot; --interactive --ignore-failed-sources /p:TargetGroup=$(TargetGroup)"
WorkingDirectory="$(RepoRoot)" />

</Target>
Expand All @@ -95,7 +90,7 @@

<!-- List all global tools and save the output. -->
<Exec Condition="Exists('$(GlobalToolsDir)')"
Command="$(DotNetCmd) tool list --tool-path &quot;$(GlobalToolsDir)&quot;"
Command="&quot;$(DotNetTool)&quot; tool list --tool-path &quot;$(GlobalToolsDir)&quot;"
WorkingDirectory="$(RepoRoot)"
ConsoleToMsBuild="true"
ContinueOnError="WarnAndContinue">
Expand All @@ -104,7 +99,7 @@

<!-- Uninstall the global tool if it exists with a different version. -->
<Exec Condition="Exists('$(GlobalToolsDir)') AND $(DotNetListToolsOutput.Contains('%(RepoTool.Identity)')) AND !$([System.Text.RegularExpressions.Regex]::IsMatch('$(DotNetListToolsOutput)', '$([System.Text.RegularExpressions.Regex]::Escape('%(RepoTool.Identity)'))\s+$([System.Text.RegularExpressions.Regex]::Escape('%(RepoTool.Version)'))'))"
Command="$(DotNetCmd) tool uninstall --tool-path &quot;$(GlobalToolsDir)&quot; %(RepoTool.Identity)"
Command="&quot;$(DotNetTool)&quot; tool uninstall --tool-path &quot;$(GlobalToolsDir)&quot; %(RepoTool.Identity)"
WorkingDirectory="$(RepoRoot)"
ContinueOnError="WarnAndContinue" />

Expand All @@ -113,7 +108,7 @@
Creates the global tools folder automatically if it doesn't exist.
-->
<Exec Condition="!Exists('$(GlobalToolsDir)') OR !$([System.Text.RegularExpressions.Regex]::IsMatch('$(DotNetListToolsOutput)', '$([System.Text.RegularExpressions.Regex]::Escape('%(RepoTool.Identity)'))\s+$([System.Text.RegularExpressions.Regex]::Escape('%(RepoTool.Version)'))'))"
Command="$(DotNetCmd) tool install --tool-path &quot;$(GlobalToolsDir)&quot; %(RepoTool.Identity) --version %(RepoTool.Version) --add-source https:%2F%2Fapi.nuget.org/v3/index.json"
Command="&quot;$(DotNetTool)&quot; tool install --tool-path &quot;$(GlobalToolsDir)&quot; %(RepoTool.Identity) --version %(RepoTool.Version) --add-source https:%2F%2Fapi.nuget.org/v3/index.json"
WorkingDirectory="$(RepoRoot)"
ContinueOnError="WarnAndContinue" />

Expand Down
5 changes: 0 additions & 5 deletions eng/configure-toolset.ps1
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions eng/configure-toolset.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion eng/publish.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<Import Project="$(PackagesDir)/$(PublishSymbolsPackage.ToLower())/$(PublishSymbolsPackageVersion)/build/PublishSymbols.targets" />
<Import Project="$(NuGetPackageRoot)/$(PublishSymbolsPackage.ToLower())/$(PublishSymbolsPackageVersion)/build/PublishSymbols.targets" />

<!-- We need to import Directory.Build.targets at the beginning because there is where we import the restored tools targets, in
this case we need Microsoft.DotNet.Build.Tasks.Feed targets to be imported. -->
Expand Down
4 changes: 2 additions & 2 deletions external/ILLink/ILLink.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<Target Name="IncludeToolsFiles"
AfterTargets="ResolvePackageAssets">
<ItemGroup>
<ReferenceCopyLocalPaths Include="$(PackagesDir)\$(ILLinkTasksPackageId)\$(ILLinkTasksPackageVersion)\tools\netcoreapp2.0\*.*">
<ReferenceCopyLocalPaths Include="$(NuGetPackageRoot)$(ILLinkTasksPackageId)\$(ILLinkTasksPackageVersion)\tools\netcoreapp2.0\*.*">
<NuGetPackageId>$(ILLinkTasksPackageId)</NuGetPackageId>
<NuGetPackageVersion>$(ILLinkTasksPackageVersion)</NuGetPackageVersion>
<SubFolder>/netcoreapp2.0/</SubFolder>
</ReferenceCopyLocalPaths>
</ItemGroup>
<ItemGroup>
<ReferenceCopyLocalPaths Include="$(PackagesDir)\$(ILLinkTasksPackageId)\$(ILLinkTasksPackageVersion)\tools\net46\*.*">
<ReferenceCopyLocalPaths Include="$(NuGetPackageRoot)$(ILLinkTasksPackageId)\$(ILLinkTasksPackageVersion)\tools\net46\*.*">
<NuGetPackageId>$(ILLinkTasksPackageId)</NuGetPackageId>
<NuGetPackageVersion>$(ILLinkTasksPackageVersion)</NuGetPackageVersion>
<SubFolder>/net46/</SubFolder>
Expand Down
2 changes: 1 addition & 1 deletion external/netfx/netfx.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
<NETStandardSupportPackageId>NETStandard.Library.NETFramework</NETStandardSupportPackageId>
<NETStandardSupportPackageVersion>2.0.1-servicing-26011-01</NETStandardSupportPackageVersion>
<NETStandardSupportRoot>$(PackagesDir)$(NETStandardSupportPackageId.ToLower())\$(NETStandardSupportPackageVersion)\build</NETStandardSupportRoot>
<NETStandardSupportRoot>$(NuGetPackageRoot)$(NETStandardSupportPackageId.ToLower())\$(NETStandardSupportPackageVersion)\build</NETStandardSupportRoot>
<AddNetStandardSupportPackage Condition="'$(TargetGroup)' == 'net461' OR '$(TargetGroup)' == 'net462' OR '$(TargetGroup)' == 'net47'">true</AddNetStandardSupportPackage>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetsNetFx)' != 'true'">
Expand Down
4 changes: 2 additions & 2 deletions external/netstandard/netstandard.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<Target Name="AddNETStandard21Refs" AfterTargets="ResolveReferences">
<PropertyGroup>
<_NETStandard21RefFolder>$(PackagesDir)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\netstandard2.1\ref</_NETStandard21RefFolder>
<_NETStandard21RefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\netstandard2.1\ref</_NETStandard21RefFolder>
</PropertyGroup>

<ItemGroup>
Expand All @@ -94,7 +94,7 @@
<Target Name="AddNETStandard20Refs" AfterTargets="ResolveReferences"
Condition="'$(_NETStandardTFMFolder)' != ''">
<PropertyGroup>
<_NETStandardRefFolder>$(PackagesDir)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder>
<_NETStandardRefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading