From d207c3e96f1aa1481013e98a550d2e805c26db72 Mon Sep 17 00:00:00 2001 From: Anipik Date: Tue, 24 Mar 2020 09:51:58 -0700 Subject: [PATCH 01/10] fixing intel for ref and src --- eng/intellisense.targets | 115 ++++++++++++++++++ src/libraries/Directory.Build.targets | 1 + .../shims/manual/Directory.Build.props | 6 +- 3 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 eng/intellisense.targets diff --git a/eng/intellisense.targets b/eng/intellisense.targets new file mode 100644 index 00000000000000..af366a9d43ba10 --- /dev/null +++ b/eng/intellisense.targets @@ -0,0 +1,115 @@ + + + <_UnsupportedTargetFrameworkError> + + + + <_OriginalTargetFramework>$(TargetFramework) + $(TargetFramework.SubString($([MSBuild]::Add($(TargetFramework.IndexOf('-')), 1)))) + $(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-')))) + + + + + <_ShortFrameworkIdentifier>$(TargetFramework.TrimEnd('.0123456789')) + <_ShortFrameworkVersion>$(TargetFramework.Substring($(_ShortFrameworkIdentifier.Length))) + + + + + v$(_ShortFrameworkVersion) + + + + + v$(_ShortFrameworkVersion[0]).0 + v$(_ShortFrameworkVersion[0]).$(_ShortFrameworkVersion[1]) + v$(_ShortFrameworkVersion[0]).$(_ShortFrameworkVersion[1]).$(_ShortFrameworkVersion[2]) + + + + + .NETStandard + .NETCoreApp + + + .NETFramework + .NETCoreApp + + + + + <_UnsupportedTargetFrameworkError>true + + + + + + true + + + + + true + + + + + true + true + + + + + true + true + + + + + true + true + ios + + + + + true + true + + + + + true + true + + + + + true + true + + + + + true + + + + + + true + true + true + + $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)')) + + \ No newline at end of file diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 7e0bdb6465ad20..323e43fc0a0845 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -22,6 +22,7 @@ $(TestStrongNameKeyId) + diff --git a/src/libraries/shims/manual/Directory.Build.props b/src/libraries/shims/manual/Directory.Build.props index 8392d98fd7fab6..67038d92d57567 100644 --- a/src/libraries/shims/manual/Directory.Build.props +++ b/src/libraries/shims/manual/Directory.Build.props @@ -14,7 +14,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(OutDirName)')) $(BaseIntermediateOutputPath)$(TargetFramework)-$(Configuration) - $(ArtifactsBinDir)runtime/$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(ArchGroup)/ + $(ArtifactsBinDir)runtime/$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(ArchGroup)/ $(TargetOS) $(TargetOS) $(NetCoreAppCurrent) @@ -22,8 +22,8 @@ + Include="$(ShimRefPath)System.*.dll;$(ShimRefPath)Microsoft.Win32.*.dll;$(ShimRefPath)netstandard.dll" + Exclude="$(ShimRefPath)$(MSBuildProjectName).dll" /> From 9e417e4dc4db1704cbfeb437be83d82145b83745 Mon Sep 17 00:00:00 2001 From: Anipik Date: Fri, 27 Mar 2020 09:23:00 -0700 Subject: [PATCH 02/10] fixing ref and src intell --- src/libraries/Directory.Build.props | 79 +-------------------- src/libraries/Directory.Build.targets | 2 +- src/libraries/dir.common.props | 75 +++++++++++++++++++ {eng => src/libraries}/intellisense.targets | 63 +--------------- 4 files changed, 82 insertions(+), 137 deletions(-) create mode 100644 src/libraries/dir.common.props rename {eng => src/libraries}/intellisense.targets (65%) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 71632768d2d3bc..4ced02c42c5774 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -51,75 +51,8 @@ Debug $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(ArchGroup) - - - - - true - win - - - - - true - unix - - - - - true - true - linux - - - - - true - true - true - android - - - - - true - true - osx - - - - - true - true - ios - - - - - true - true - freebsd - - - - - true - true - netbsd - - - - - true - true - - - - - true - - - + + @@ -209,13 +142,6 @@ $(ArchGroup) - - - true - true - true - - true @@ -242,6 +168,7 @@ + $(CustomBeforeMicrosoftCommonTargets);$(RepositoryEngineeringDir)intellisense.targets portable diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 323e43fc0a0845..e156508fcf0007 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -22,7 +22,7 @@ $(TestStrongNameKeyId) - + diff --git a/src/libraries/dir.common.props b/src/libraries/dir.common.props new file mode 100644 index 00000000000000..77257c457e264f --- /dev/null +++ b/src/libraries/dir.common.props @@ -0,0 +1,75 @@ + + + + + true + win + + + + + true + unix + + + + + true + true + linux + + + + + true + true + true + android + + + + + true + true + osx + + + + + true + true + ios + + + + + true + true + freebsd + + + + + true + true + netbsd + + + + + true + true + + + + + true + + + + + true + true + true + + diff --git a/eng/intellisense.targets b/src/libraries/intellisense.targets similarity index 65% rename from eng/intellisense.targets rename to src/libraries/intellisense.targets index af366a9d43ba10..97aa03371782d0 100644 --- a/eng/intellisense.targets +++ b/src/libraries/intellisense.targets @@ -50,66 +50,9 @@ <_UnsupportedTargetFrameworkError>true - - - - true - - - - - true - - - - - true - true - - - - - true - true - - - - - true - true - ios - - - - - true - true - - - - - true - true - - - - - true - true - - - - - true - - - - + + - true - true - true - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)')) - \ No newline at end of file + From 2786489cd9db989ed52aac538fc9ed4bf631e9c0 Mon Sep 17 00:00:00 2001 From: Anipik Date: Fri, 27 Mar 2020 11:02:53 -0700 Subject: [PATCH 03/10] renaming props file --- src/libraries/Directory.Build.props | 2 +- src/libraries/intellisense.targets | 2 +- src/libraries/{dir.common.props => targetframework.props} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/libraries/{dir.common.props => targetframework.props} (100%) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 4ced02c42c5774..b739664c6f0b9a 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -52,7 +52,7 @@ $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(ArchGroup) - + diff --git a/src/libraries/intellisense.targets b/src/libraries/intellisense.targets index 97aa03371782d0..03d261fb48675b 100644 --- a/src/libraries/intellisense.targets +++ b/src/libraries/intellisense.targets @@ -50,7 +50,7 @@ <_UnsupportedTargetFrameworkError>true - + $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)')) diff --git a/src/libraries/dir.common.props b/src/libraries/targetframework.props similarity index 100% rename from src/libraries/dir.common.props rename to src/libraries/targetframework.props From 200407d6df2171e1c4054d33ea06f7c0affda197 Mon Sep 17 00:00:00 2001 From: Anipik Date: Fri, 27 Mar 2020 11:36:06 -0700 Subject: [PATCH 04/10] remove extra property --- src/libraries/Directory.Build.props | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index b739664c6f0b9a..e91b1f1045603e 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -168,7 +168,6 @@ - $(CustomBeforeMicrosoftCommonTargets);$(RepositoryEngineeringDir)intellisense.targets portable From 1a1c9ffb2fdc96b90b1bb24525a0463cc53bcc50 Mon Sep 17 00:00:00 2001 From: Anipik Date: Fri, 27 Mar 2020 13:40:21 -0700 Subject: [PATCH 05/10] fixing the intellisense in tests --- src/libraries/Directory.Build.props | 2 +- src/libraries/intellisense.targets | 50 ++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index e91b1f1045603e..de0b97427f1e58 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -52,7 +52,7 @@ $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(ArchGroup) - + diff --git a/src/libraries/intellisense.targets b/src/libraries/intellisense.targets index 03d261fb48675b..767bd00473d810 100644 --- a/src/libraries/intellisense.targets +++ b/src/libraries/intellisense.targets @@ -1,6 +1,10 @@ <_UnsupportedTargetFrameworkError> + + + + @@ -51,8 +55,52 @@ - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(MSBuildProjectName)')) + $(BaseIntermediateOutputPath)$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)\ + $(BaseIntermediateOutputPath)$(TargetFramework)-$(Configuration)\ + + + + $(TargetFrameworkIdentifier),Version=$(TargetFrameworkVersion),Profile=$(TargetFrameworkProfile) + $(TargetFrameworkIdentifier),Version=$(TargetFrameworkVersion) + + + + $(MSBuildProjectExtensionsPath)/project.assets.json + $([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile))) + + + $(IntermediateOutputPath)$(MSBuildProjectName).assets.cache + $([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsCacheFile))) + + + false + + + false + + + true + + $(IntermediateOutputPath)NuGet\ + + true + $(TargetPlatformIdentifier),Version=v$([System.Version]::Parse('$(TargetPlatformMinVersion)').ToString(3)) + $(TargetFrameworkMoniker) + + true + + + + + <_NugetTargetMonikerAndRID Condition="'$(RuntimeIdentifier)' == ''">$(NuGetTargetMoniker) + <_NugetTargetMonikerAndRID Condition="'$(RuntimeIdentifier)' != ''">$(NuGetTargetMoniker)/$(RuntimeIdentifier) From 336ce822ef9a711b91216689521c77084b6d6d45 Mon Sep 17 00:00:00 2001 From: Anipik Date: Fri, 27 Mar 2020 13:42:18 -0700 Subject: [PATCH 06/10] add extra line --- src/libraries/intellisense.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/intellisense.targets b/src/libraries/intellisense.targets index 767bd00473d810..c057d0867a0f3c 100644 --- a/src/libraries/intellisense.targets +++ b/src/libraries/intellisense.targets @@ -55,6 +55,7 @@ + $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(MSBuildProjectName)')) From 9a17d66e3b1d7d045c79eb64b20b9fd43b013e03 Mon Sep 17 00:00:00 2001 From: Anipik Date: Fri, 27 Mar 2020 17:01:20 -0700 Subject: [PATCH 07/10] addressing feedback --- src/libraries/Directory.Build.props | 5 ----- src/libraries/intellisense.targets | 35 ++--------------------------- src/libraries/targetframework.props | 10 +++++++++ 3 files changed, 12 insertions(+), 38 deletions(-) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index de0b97427f1e58..e4e6fe79803c88 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -241,9 +241,7 @@ false $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'runtime', '$(BuildSettings)')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ref')) $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(BuildTargetFramework)')) - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)')) $([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.0')) $([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.1')) $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(NetFrameworkCurrent)')) @@ -275,9 +273,6 @@ $(BaseOutputPath)$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)\ $(BaseOutputPath)$(TargetFramework)-$(Configuration)\ - $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(MSBuildProjectName)')) - $(BaseIntermediateOutputPath)$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)\ - $(BaseIntermediateOutputPath)$(TargetFramework)-$(Configuration)\ $(AdditionalBuildTargetFrameworks);netstandard2.0 diff --git a/src/libraries/intellisense.targets b/src/libraries/intellisense.targets index c057d0867a0f3c..5da82f1716ad21 100644 --- a/src/libraries/intellisense.targets +++ b/src/libraries/intellisense.targets @@ -57,10 +57,7 @@ - $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(MSBuildProjectName)')) - $(BaseIntermediateOutputPath)$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)\ - $(BaseIntermediateOutputPath)$(TargetFramework)-$(Configuration)\ + $(IntermediateOutputPath)$(MSBuildProjectName).AssemblyInfo$(DefaultLanguageSourceExtension) @@ -69,39 +66,11 @@ - $(MSBuildProjectExtensionsPath)/project.assets.json - $([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsFile))) - $(IntermediateOutputPath)$(MSBuildProjectName).assets.cache $([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsCacheFile))) - - - false - - - false - - - true - - $(IntermediateOutputPath)NuGet\ - - true - $(TargetPlatformIdentifier),Version=v$([System.Version]::Parse('$(TargetPlatformMinVersion)').ToString(3)) - $(TargetFrameworkMoniker) - - true + $(TargetFrameworkMoniker) - - - <_NugetTargetMonikerAndRID Condition="'$(RuntimeIdentifier)' == ''">$(NuGetTargetMoniker) - <_NugetTargetMonikerAndRID Condition="'$(RuntimeIdentifier)' != ''">$(NuGetTargetMoniker)/$(RuntimeIdentifier) - diff --git a/src/libraries/targetframework.props b/src/libraries/targetframework.props index 77257c457e264f..d0c0182d16c9e9 100644 --- a/src/libraries/targetframework.props +++ b/src/libraries/targetframework.props @@ -67,9 +67,19 @@ + true true true + + + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ref')) + $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(MSBuildProjectName)')) + $(BaseIntermediateOutputPath)$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)\ + $(BaseIntermediateOutputPath)$(TargetFramework)-$(Configuration)\ + + From 576b71cf7245bc97a1ec2901529005d16951e9dc Mon Sep 17 00:00:00 2001 From: Anipik Date: Sun, 29 Mar 2020 22:49:35 -0700 Subject: [PATCH 08/10] revert shim path --- src/libraries/shims/manual/Directory.Build.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/shims/manual/Directory.Build.props b/src/libraries/shims/manual/Directory.Build.props index 9386416fdf6f19..b29cb02865ed04 100644 --- a/src/libraries/shims/manual/Directory.Build.props +++ b/src/libraries/shims/manual/Directory.Build.props @@ -14,7 +14,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(OutDirName)')) $(BaseIntermediateOutputPath)$(TargetFramework)-$(Configuration) - $(ArtifactsBinDir)runtime/$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)/ + $(ArtifactsBinDir)runtime/$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)/ $(TargetOS) $(TargetOS) $(NetCoreAppCurrent) @@ -22,8 +22,8 @@ + Include="$(RefPath)System.*.dll;$(RefPath)Microsoft.Win32.*.dll;$(RefPath)netstandard.dll" + Exclude="$(RefPath)$(MSBuildProjectName).dll" /> From 05e7b73fd942f6f45abde6c9a4864cbdb065e7ef Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Mon, 30 Mar 2020 10:23:38 -0700 Subject: [PATCH 09/10] fix allconfig restore --- src/libraries/Directory.Build.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 7b206384c4a1ea..3900b9babe4229 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -52,8 +52,6 @@ $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) - - false @@ -165,6 +163,7 @@ + From a71a17dcd231ef6153fa725454cb1cbf95568fcb Mon Sep 17 00:00:00 2001 From: Anipik Date: Tue, 31 Mar 2020 12:11:12 -0700 Subject: [PATCH 10/10] adding comment --- src/libraries/intellisense.targets | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libraries/intellisense.targets b/src/libraries/intellisense.targets index 5da82f1716ad21..816f787e7541de 100644 --- a/src/libraries/intellisense.targets +++ b/src/libraries/intellisense.targets @@ -1,4 +1,8 @@ + <_UnsupportedTargetFrameworkError>