Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Convert all projects to SDK-style #29831

Merged
merged 27 commits into from
Jul 8, 2018
Merged

Convert all projects to SDK-style #29831

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
91d7e62
Convert all .csproj files in src to SDK-style projects
wtgodbe May 21, 2018
be0421d
Add Directory.build.props/targets
wtgodbe May 21, 2018
f60fa38
Add project.assets.json & edit properties
wtgodbe May 21, 2018
10b7151
Remove project.assets.json file
wtgodbe May 21, 2018
3ecd281
Get netcoreapp build working.
eerhardt Jun 11, 2018
ad505eb
Merge master into SdkProj
eerhardt Jun 11, 2018
be5ceb5
Clean up projects. Get all projects importing clean with no warnings…
eerhardt Jun 12, 2018
204a8db
Rename dir files to Directory.Build
eerhardt Jun 15, 2018
1c91f96
merge master into SdkProj
eerhardt Jun 16, 2018
3b36996
Small fixes to get the build clean.
eerhardt Jun 16, 2018
b09b0b5
Fix AssemblySearchPaths on the Microsoft.NET.Sdk.
eerhardt Jun 16, 2018
67dacd6
Ensure csc command line is the same as before converting to Sdk proje…
eerhardt Jun 19, 2018
0c7364e
Merge master into SdkProj
eerhardt Jun 19, 2018
53d5973
Fix FileVersionInfo build
eerhardt Jun 19, 2018
6d25667
Rephrase Directory.Build comments to better describe why ImportDirect…
eerhardt Jun 20, 2018
e05508a
Change .csproj to new Configurations property
eerhardt Jun 28, 2018
9f65193
Turn off ILLinkTrimAssembly during design-time builds.
eerhardt Jun 29, 2018
ec546de
Merge master into SdkProj
eerhardt Jun 29, 2018
860888c
Fix up Reflection.Context dir.props/targets to Directory.Build.
eerhardt Jun 29, 2018
6ccae92
Revert WebServer change, since it cannot be an SDK style project.
eerhardt Jun 29, 2018
0343b37
Merge master into SdkProj
eerhardt Jul 5, 2018
1a4b8a2
Run UpdateVSConfigurations on the current code.
eerhardt Jul 5, 2018
9b7b8c0
Fix up new projects and usages of dir.props/targets.
eerhardt Jul 5, 2018
e72643b
Merge master into SdkProj
eerhardt Jul 6, 2018
aa89672
Set TargetFramework to workaround project system bug.
eerhardt Jul 6, 2018
b86cade
Merge remote-tracking branch 'upstream/master' into SdkProj
eerhardt Jul 6, 2018
99e21e6
Merge master into SdkProj
eerhardt Jul 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 17 additions & 1 deletion dir.props → Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Condition="Exists('..\dir.props')" Project="..\dir.props" />

<PropertyGroup>
<!--
For non-SDK projects that import this file and then import Microsoft.Common.props,
tell Microsoft.Common.props not to import Directory.Build.props again
-->
<ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this necessary?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of the projects that aren't SDK style projects (like depproj or pkgproj). What they do:

  1. Import Directory.Build.props at the top of the project
  2. Import Microsoft.Common.props from MSBuild (probably from importing BuildTools stuff)
  3. Microsoft.Common.props will try to import Directory.Build.props again, and thus you get a warning.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I make the comment better here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is definitely added confusion to me as I was expecting this to automatically be imported. Is there any way we can just let the SDK import these in those project types as well? Or are they too much work right now to convert to SDK?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way Directory.Build.props|targets files get automatically imported is by someone importing Microsoft.Common.props|targets. If your project isn't an "SDK-style" project, then somewhere in your project, you need an explicit <Import> statement in order to get the Microsoft.Common.props|targets imported.

So in order to do that, we would either need to:

  1. Make depproj and pkgproj (basically ALL our project files in corefx) be some sort of "SDK-style" projects. And in that "SDK", it would need to import Microsoft.Common.props|targets.
  2. Explicitly Import a different .props|.targets set of files at the top and bottom of the .depproj and .pkgproj files. Then that other set of .props|.targets files would import Microsoft.Common.props|targets at the right place, which would then import the Directory.Build.props|targets correctly.

I haven't tried (1) above, yet. You said @joperezr was working on the pkgproj projects, so I didn't want to do any work there. Also, it feels like we should try to make incremental progress here - get the .csproj's converted first, then worry about .depproj and .pkgproj.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For now I'm fine if you could please update the comment to call out this is about dealing with the non-sdk projects.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

</PropertyGroup>

<!-- We shipped assembly file version 4.6.x up until the end of rc3. Version assembly as
4.6.x to ensure compatability in Visual Studio for an in-place update. -->
Expand Down Expand Up @@ -312,6 +319,15 @@
<IncludeDllSafeSearchPathAttribute Condition="'$(TargetGroup)' == 'netstandard1.0'">false</IncludeDllSafeSearchPathAttribute>
</PropertyGroup>

<!-- Set up default paths for reference assemblies -->
<PropertyGroup Condition="'$(IsReferenceAssembly)'=='true'">
<!-- Create a common root output directory for all reference assemblies -->
<ReferenceAssemblyOutputPath Condition="'$(ReferenceAssemblyOutputPath)' == ''">$(BaseOutputPath)ref/</ReferenceAssemblyOutputPath>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did these get moved here instead of using the ones in BuildTools? https://github.com/dotnet/buildtools/blob/16a6d1f39cf0a572041d51bd318913548ba41b34/src/Microsoft.DotNet.Build.Tasks/PackageFiles/ReferenceAssemblies.targets#L15

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m not entirely sure why this changed. I asked @wtgodbe and he said that change was included with @joperezr’s initial changes. I can try reverting it to see what happens.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to understand if it is needed here still.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've investigated why this was being set.

The reason looks to be that the BuildTools setting of $(OutputPath) is now occurring too late in the project evaluation. Before SDK-style projects, BuildTools' ReferenceAssemblies.targets is imported before Microsoft.Common.targets. Now, with SDK-style projects, ReferenceAssemblies.targets is being imported after Microsoft.Common.targets.

This change was attempting to set these properties earlier, but aren't the real fix since $(AssemblyVersion) is not set yet. To fix this, I opened a BuildTools PR: dotnet/buildtools#2091. After we take that fix into corefx, we can remove this section and use the ones in BuildTools.

<TargetOutputRelPath Condition="'$(IsCompatAssembly)'=='true'">$(TargetOutputRelPath)Compat/</TargetOutputRelPath>
<OutputPath>$(ReferenceAssemblyOutputPath)$(MSBuildProjectName)/$(TargetOutputRelPath)</OutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)ref/$(AssemblyName)/$(TargetOutputRelPath)</IntermediateOutputPath>
</PropertyGroup>

<!-- Properties related to multi-file mode for ILC tests -->
<PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
<!-- Only enable multi-file for Release-x64 and Debug-x86 for now -->
Expand Down
8 changes: 8 additions & 0 deletions dir.targets → Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" InitialTargets="CheckForBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<!--
For non-SDK projects that import this file and then import Microsoft.Common.targets,
tell Microsoft.Common.targets not to import Directory.Build.targets again
-->
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
</PropertyGroup>

<Target Name="CheckForBuildTools">
<Error Condition="!Exists('$(ToolsDir)') and '$(OverrideToolsDir)'=='true'"
Text="The tools directory [$(ToolsDir)] does not exist. Please run sync in your repo to ensure the tools are installed before attempting to build an individual project." />
Expand Down
6 changes: 3 additions & 3 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="dir.props" />
<Import Project="Directory.Build.props" />

<!-- required to build the projects in their specified order -->
<PropertyGroup>
Expand All @@ -22,7 +22,7 @@
<Project Include="src\packages.builds" Condition="'$(BuildPackages)'=='true'" />
</ItemGroup>

<Import Project="dir.targets" />
<Import Project="Directory.Build.targets" />

<Import Project="dir.traversal.targets" />

Expand Down Expand Up @@ -58,7 +58,7 @@
<_projectsToExcludeFromUpdate Include="$(MSBuildThisFileDirectory)src/SharedFrameworkValidation/**/*.csproj" />
<_projectsToUpdate Include="$(MSBuildThisFileDirectory)src/**/*.*csproj" Exclude="@(_projectsToExcludeFromUpdate)" />
<_projectsToUpdate Include="$(MSBuildThisFileDirectory)src/**/*.*ilproj" Exclude="@(_projectsToExcludeFromUpdate)" />
<_solutionsToUpdateFiles Include="$(MSBuildThisFileDirectory)src/*/dir.props" />
<_solutionsToUpdateFiles Include="$(MSBuildThisFileDirectory)src/*/Directory.Build.props" />
<_solutionsToUpdate Include="@(_solutionsToUpdateFiles->'%(RootDir)%(Directory)')" Exclude="@(_solutionsToExcludeFromUpdate)" />
</ItemGroup>
<UpdateVSConfigurations ProjectsToUpdate="@(_projectsToUpdate)" SolutionsToUpdate="@(_solutionsToUpdate)" />
Expand Down
2 changes: 1 addition & 1 deletion external/dir.props → external/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<IntermediateOutputPath>$(IntermediateOutputPath)$(OSGroup)-$(ArchGroup)/</IntermediateOutputPath>
<NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
Expand Down
2 changes: 1 addition & 1 deletion external/dir.targets → external/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.targets" />
<Import Project="..\Directory.Build.targets" />

<PropertyGroup>
<RestorePackages>true</RestorePackages>
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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
<NuGetTargetMonikerShort>netcoreapp1.1</NuGetTargetMonikerShort>
Expand All @@ -16,7 +16,7 @@
<Version>$(ILLinkTasksPackageVersion)</Version>
</PackageReference>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
<Target Name="IncludeToolsFiles"
AfterTargets="ResolveNuGetPackages">
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

<PropertyGroup>
<_LatestStable>1.1.2</_LatestStable>
Expand All @@ -27,5 +27,5 @@
<Copy SourceFiles="@(_RuntimeAssets)" DestinationFolder="$(BinDir)runtime/SharedFrameworkValidation.LKG" />
</Target>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>
2 changes: 1 addition & 1 deletion external/dir.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project ToolsVersion="14.0" DefaultTargets="BuildAndTest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="../dir.props" />
<Import Project="../Directory.Build.props" />

<PropertyGroup>
<AdditionalBuildConfigurations>$(AdditionalBuildConfigurations);netstandard-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</AdditionalBuildConfigurations>
Expand Down
4 changes: 2 additions & 2 deletions external/docs/docs.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

<PropertyGroup>
<OutputPath>$(XmlDocDir)</OutputPath>
Expand Down Expand Up @@ -49,5 +49,5 @@
<Error Condition="'%(DocFile.Culture)' == 'unknown'" Text="Unknown language folder '%(LCID)' for doc files '@(DocFile)'" />
</Target>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>
4 changes: 2 additions & 2 deletions external/harvestPackages/harvestPackages.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
Expand Down
4 changes: 2 additions & 2 deletions external/netcoreapp/netcoreapp.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<!-- This project restores and publishes the targeting pack for specific versions of .NET Core.
With this, we are able to compile assemblies against shipped, stable versions of .NET Core. -->
<PropertyGroup>
Expand Down Expand Up @@ -37,5 +37,5 @@
<FileToExclude Include="System.ComponentModel.Composition" />
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>
4 changes: 2 additions & 2 deletions external/netfx/netfx.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<Import Project="$(SourceDir)\shims\netfxreference.props" />
<PropertyGroup>
<BinPlaceRef>true</BinPlaceRef>
Expand Down Expand Up @@ -98,5 +98,5 @@
<Reference Include="@(_remainingReference);@(_netStandardReference)" />
</ItemGroup>
</Target>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>
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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<NETStandardVersion Condition="$(NuGetTargetMoniker.StartsWith('.NETStandard,Version=v'))">$(NuGetTargetMoniker.SubString(22))</NETStandardVersion>
<IsNETStandard1x Condition="$(NETStandardVersion.StartsWith('1.'))">true</IsNETStandard1x>
Expand Down Expand Up @@ -81,5 +81,5 @@
</ItemGroup>
</Target>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>
4 changes: 2 additions & 2 deletions external/portable/portable.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<BinPlaceRef>true</BinPlaceRef>
<NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
Expand All @@ -16,5 +16,5 @@
<RefPath>$(RefPath)</RefPath>
</BinPlaceConfiguration>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>
4 changes: 2 additions & 2 deletions external/runtime/runtime.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<NugetRuntimeIdentifier>$(PackageRID)</NugetRuntimeIdentifier>
<RidSpecificAssets>true</RidSpecificAssets>
Expand Down Expand Up @@ -48,7 +48,7 @@
</PackageReference>
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />

<ItemGroup>
<!-- For IL rewrite tools of crossgen dll from CoreClr we need the respective IL and respective pdbs -->
Expand Down
4 changes: 2 additions & 2 deletions external/test-runtime/XUnit.Runtime.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets
The only asset that we copy which is RID-specific is sni.dll which is only used in windows, which is why we default to Windows as the RID -->
Expand Down Expand Up @@ -152,7 +152,7 @@
<PackageToInclude Include="CommandLineParser" />
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />

<!-- Retrieve the UAP Tools to the TestHost folder -->
<Target Name="CopyUAPToolsToTestHost"
Expand Down
4 changes: 2 additions & 2 deletions external/uap/uap.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<!-- This project restores and publishes the targeting pack for specific versions of UAP.
With this, we are able to compile assemblies against shipped, stable versions of UAP. -->
<PropertyGroup>
Expand Down Expand Up @@ -35,5 +35,5 @@
</BinPlaceConfiguration>
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>
4 changes: 2 additions & 2 deletions external/winrt/winrt.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<AssemblyName>Windows</AssemblyName>
<TargetExt>.winmd</TargetExt>
Expand All @@ -12,5 +12,5 @@
<Version>1.0.5</Version>
</PackageReference>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>
2 changes: 1 addition & 1 deletion illink.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TargetsTriggeredByCompilation>
<TargetsTriggeredByCompilation Condition="'$(DesignTimeBuild)' != 'true'">
$(TargetsTriggeredByCompilation);
_SetILLinkTrimAssembly;
ILLinkTrimAssembly
Expand Down
2 changes: 1 addition & 1 deletion pkg/dir.props → pkg/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<Import Project="..\Directory.Build.props" />

<PropertyGroup>
<!-- Used to determine if we should build some packages only once across multiple official build legs.
Expand Down
2 changes: 1 addition & 1 deletion pkg/dir.targets → pkg/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Import Condition="'$(IsFrameworkPackage)' == 'true'" Project="frameworkPackage.targets" />

<Import Project="..\dir.targets" />
<Import Project="..\Directory.Build.targets" />

<Target Name="ApplyBaselineToStaticDependencies"
BeforeTargets="AssignPkgProjPackageDependenciesTargetFramework"
Expand Down
2 changes: 1 addition & 1 deletion pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<ItemGroup Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'">
<Project Include="Microsoft.NETCore.Platforms.pkgproj" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<PackageVersion>3.0.0</PackageVersion>
<SkipValidatePackage>true</SkipValidatePackage>
Expand All @@ -15,5 +15,5 @@
</File>
</ItemGroup>
<Import Project="runtimeGroups.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>
2 changes: 1 addition & 1 deletion pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<ItemGroup Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'">
<Project Include="Microsoft.NETCore.Targets.pkgproj"/>
</ItemGroup>
Expand Down
Loading