move netcore platforms and targets to csproj (#46474)

dotnet · Jan 4, 2021 · 891e8d4 · 891e8d4
1 parent f640d32
commit 891e8d4
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 20 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -210,7 +210,7 @@
     <RepositoryUrl>git://github.com/dotnet/$(GitHubRepositoryName)</RepositoryUrl>
     <ProjectUrl>https://github.com/dotnet/$(GitHubRepositoryName)</ProjectUrl>
     <LicenseUrl>https://github.com/dotnet/$(GitHubRepositoryName)/blob/master/LICENSE.TXT</LicenseUrl>
-    <RuntimeIdGraphDefinitionFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'pkg', 'Microsoft.NETCore.Platforms', 'runtime.json'))</RuntimeIdGraphDefinitionFile>
+    <RuntimeIdGraphDefinitionFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'pkg', 'runtime.json'))</RuntimeIdGraphDefinitionFile>
     <LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>$(CopyrightNetFoundation)</Copyright>

diff --git a/docs/coding-guidelines/project-guidelines.md b/docs/coding-guidelines/project-guidelines.md
@@ -26,7 +26,7 @@ The following are the properties associated with each build pivot
 - `$(TargetOS) -> Windows | Linux | OSX | FreeBSD | [defaults to running OS when empty]`
 - `$(Configuration) -> Release | [defaults to Debug when empty]`
 - `$(TargetArchitecture) - x86 | x64 | arm | arm64 | [defaults to x64 when empty]`
-- `$(RuntimeOS) - win7 | osx10.10 | ubuntu.14.04 | [any other RID OS+version] | [defaults to running OS when empty]` See [RIDs](https://github.com/dotnet/runtime/tree/master/src/libraries/pkg/Microsoft.NETCore.Platforms) for more info.
+- `$(RuntimeOS) - win7 | osx10.10 | ubuntu.14.04 | [any other RID OS+version] | [defaults to running OS when empty]` See [RIDs](https://github.com/dotnet/runtime/tree/master/src/libraries/Microsoft.NETCore.Platforms) for more info.
 
 ## Aggregate build properties
 Each project will define a set of supported TargetFrameworks

diff --git a/...forms/Microsoft.NETCore.Platforms.pkgproj → ...s/pkg/Microsoft.NETCore.Platforms.pkgproj b/...forms/Microsoft.NETCore.Platforms.pkgproj → ...s/pkg/Microsoft.NETCore.Platforms.pkgproj
diff --git a/...Core.Platforms/runtime.compatibility.json → ....Platforms/pkg/runtime.compatibility.json b/...Core.Platforms/runtime.compatibility.json → ....Platforms/pkg/runtime.compatibility.json
diff --git a/.../Microsoft.NETCore.Platforms/runtime.json → ...rosoft.NETCore.Platforms/pkg/runtime.json b/.../Microsoft.NETCore.Platforms/runtime.json → ...rosoft.NETCore.Platforms/pkg/runtime.json
diff --git a/...oft.NETCore.Platforms/runtimeGroups.props → ...NETCore.Platforms/pkg/runtimeGroups.props b/...oft.NETCore.Platforms/runtimeGroups.props → ...NETCore.Platforms/pkg/runtimeGroups.props
diff --git a/...pkg/Microsoft.NETCore.Platforms/readme.md → ...ies/Microsoft.NETCore.Platforms/readme.md b/...pkg/Microsoft.NETCore.Platforms/readme.md → ...ies/Microsoft.NETCore.Platforms/readme.md
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <!-- These are wrapper project files for packaging.-->
+  <PropertyGroup>
+    <TargetFrameworks>netstandard1.0</TargetFrameworks>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <!-- Avoid trying to binplace non existent documentation file.-->
+    <EnableBinPlacing>false</EnableBinPlacing>
+  </PropertyGroup>
+</Project>
diff --git a/...Targets/Microsoft.NETCore.Targets.pkgproj → ...ets/pkg/Microsoft.NETCore.Targets.pkgproj b/...Targets/Microsoft.NETCore.Targets.pkgproj → ...ets/pkg/Microsoft.NETCore.Targets.pkgproj
diff --git a/src/libraries/Microsoft.NETCore.Targets/src/Microsoft.NETCore.Targets.csproj b/src/libraries/Microsoft.NETCore.Targets/src/Microsoft.NETCore.Targets.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <!-- These are wrapper project files for packaging.-->
+  <PropertyGroup>
+    <TargetFrameworks>netstandard1.0</TargetFrameworks>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <!-- Avoid trying to binplace non existent documentation file.-->
+    <EnableBinPlacing>false</EnableBinPlacing>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
@@ -14,6 +14,8 @@
 
   <ItemGroup>
     <ProjectReference Include="$(PkgDir)*\*.proj" Exclude="$(PkgDir)test\*" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Platforms\src\Microsoft.NETCore.Platforms.csproj" Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)\Microsoft.NETCore.Targets\src\Microsoft.NETCore.Targets.csproj" Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.*proj"
                       Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true')"
                       Exclude="$(MSBuildThisFileDirectory)*\src\**\*.shproj"/>

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.proj b/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.proj
diff --git a/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.proj b/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.proj