diff --git a/Build.proj b/Build.proj index 5f47e869fb6e..baa240685ae5 100644 --- a/Build.proj +++ b/Build.proj @@ -8,9 +8,6 @@ - - - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc')) $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'mibc')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs')) - $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles', 'net')) $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'docs')) $([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages')) diff --git a/eng/intellisense.targets b/eng/intellisense.targets new file mode 100644 index 000000000000..f00dab6e5fc3 --- /dev/null +++ b/eng/intellisense.targets @@ -0,0 +1,51 @@ + + + + true + + + + + + + + + $(NoWarn);1591 + $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles')) + $([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net', '1033', '$(AssemblyName).xml')) + $([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml')) + $(IntellisensePackageXmlFilePathFromNetFolder) + $(IntellisensePackageXmlFilePathFromDotNetPlatExtFolder) + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/packaging.targets b/eng/packaging.targets index e5cfa659cfaf..3280c79c475d 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -28,9 +28,7 @@ true - - $(XmlDocFileRoot)1033\$(AssemblyName).xml - true + false @@ -108,16 +106,6 @@ ($(TargetFrameworks.Contains('$(NetFrameworkMinimum)')) or $(TargetFrameworks.Contains('net47')) or $(TargetFrameworks.Contains('net48')))" /> - - - - - - - - - - - - - - - - - - $([System.String]::new('%(RecursiveDir)').TrimEnd('\/')) - - - - unknown - zh-hant/ - de/ - - - fr/ - it/ - ja/ - ko/ - ru/ - zh-hans/ - es/ - - - %(Culture)/ - - - - - - - - - - diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj index f1e52a78e99c..5efeb4c15690 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj @@ -14,7 +14,7 @@ - + diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 26a32b81b781..60e1781782a5 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -2,6 +2,11 @@ true true + + true diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index dfd6937366ad..ab2d99f3644f 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -77,6 +77,7 @@ + diff --git a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj index bb71e12e648e..2e43a07a64d8 100644 --- a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj +++ b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj @@ -3,6 +3,7 @@ $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true true + false Provides classes that can read and write the CBOR data format. Commonly Used Types: