Add SDKAnalysisLevel and UsingMicrosoftNETSdk to packageSpec

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/LegacyPackageReferenceProject.cs

@@ -511,6 +511,8 @@ private async Task<PackageSpec> GetPackageSpecAsync(ISettings settings)
             string centralPackageTransitivePinningEnabled = GetPropertySafe(_vsProjectAdapter.BuildProperties, ProjectBuildProperties.CentralPackageTransitivePinningEnabled);
             // Do not add new properties here. Use BuildProperties.GetPropertyValue instead, without DTE fallback.
 #pragma warning restore CS0618 // Type or member is obsolete
+            string skdAnalysisLevelString = _vsProjectAdapter.BuildProperties.GetPropertyValue(ProjectBuildProperties.SdkAnalysisLevel);
+            string usingNetSdk = _vsProjectAdapter.BuildProperties.GetPropertyValue(ProjectBuildProperties.UsingMicrosoftNETSdk);
 
             return new PackageSpec(tfis)
             {
@@ -555,6 +557,8 @@ private async Task<PackageSpec> GetPackageSpecAsync(ISettings settings)
                     CentralPackageFloatingVersionsEnabled = MSBuildStringUtility.IsTrue(_vsProjectAdapter.BuildProperties.GetPropertyValue(ProjectBuildProperties.CentralPackageFloatingVersionsEnabled)),
                     CentralPackageTransitivePinningEnabled = MSBuildStringUtility.IsTrue(centralPackageTransitivePinningEnabled),
                     RestoreAuditProperties = auditProperties,
+                    SdkAnalysisLevel = MSBuildRestoreUtility.GetSdkAnalysisLevel(skdAnalysisLevelString),
+                    UsingMicrosoftNETSdk = MSBuildRestoreUtility.GetUsingMicrosoftNETSdk(usingNetSdk),
                 }
             };
         }

src/NuGet.Clients/NuGet.SolutionRestoreManager/VSNominationUtilities.cs

@@ -21,6 +21,7 @@
 using NuGet.Shared;
 using NuGet.Versioning;
 using NuGet.VisualStudio;
+using static Microsoft.TeamFoundation.Client.CommandLine.Options;
 using static NuGet.Frameworks.FrameworkConstants;
 
 namespace NuGet.SolutionRestoreManager
@@ -712,5 +713,26 @@ private static string[] HandleClear(string[] input)
 
             return input;
         }
+
+        internal static NuGetVersion? GetSdkAnalysisLevel(IReadOnlyList<IVsTargetFrameworkInfo4> targetFrameworks)
+        {
+            string? skdAnalysisLevelString = GetSingleNonEvaluatedPropertyOrNull(targetFrameworks, nameof(ProjectBuildProperties.SdkAnalysisLevel), v => v);
+
+            return skdAnalysisLevelString is null
+            ? null
+            : MSBuildRestoreUtility.GetSdkAnalysisLevel(skdAnalysisLevelString);
+        }
+
+        internal static bool GetUsingMicrosoftNETSdk(IReadOnlyList<IVsTargetFrameworkInfo4> targetFrameworks)
+        {
+            string? usingNetSdk = GetSingleNonEvaluatedPropertyOrNull(targetFrameworks, nameof(ProjectBuildProperties.UsingMicrosoftNETSdk), v => v);
+
+            if (usingNetSdk is not null)
+            {
+                return MSBuildRestoreUtility.GetUsingMicrosoftNETSdk(usingNetSdk);
+            }
+
+            return false;
+        }
     }
 }

src/NuGet.Clients/NuGet.SolutionRestoreManager/VsSolutionRestoreService.cs

@@ -387,9 +387,11 @@ internal static PackageSpec ToPackageSpec(ProjectNames projectNames, IVsProjectR
                     CentralPackageVersionOverrideDisabled = VSNominationUtilities.IsCentralPackageVersionOverrideDisabled(targetFrameworks),
                     CentralPackageTransitivePinningEnabled = VSNominationUtilities.IsCentralPackageTransitivePinningEnabled(targetFrameworks),
                     RestoreAuditProperties = VSNominationUtilities.GetRestoreAuditProperties(targetFrameworks),
+                    SdkAnalysisLevel = VSNominationUtilities.GetSdkAnalysisLevel(targetFrameworks),
+                    UsingMicrosoftNETSdk = VSNominationUtilities.GetUsingMicrosoftNETSdk(targetFrameworks),
                 },
                 RuntimeGraph = VSNominationUtilities.GetRuntimeGraph(targetFrameworks),
-                RestoreSettings = new ProjectRestoreSettings() { HideWarningsAndErrors = true }
+                RestoreSettings = new ProjectRestoreSettings() { HideWarningsAndErrors = true },
             };
 
             return packageSpec;

src/NuGet.Core/NuGet.Build.Tasks.Console/MSBuildStaticGraphRestore.cs

@@ -892,6 +892,13 @@ private PackageSpec GetPackageSpec(IMSBuildProject project, IReadOnlyDictionary<
             restoreMetadata.RestoreLockProperties = new RestoreLockProperties(project.GetProperty("RestorePackagesWithLockFile"), project.GetProperty("NuGetLockFilePath"), project.IsPropertyTrue("RestoreLockedMode"));
             restoreMetadata.Sources = GetSources(project, innerNodes, settings);
             restoreMetadata.TargetFrameworks = GetProjectRestoreMetadataFrameworkInfos(targetFrameworkInfos, projectsByTargetFramework);
+            restoreMetadata.UsingMicrosoftNETSdk = MSBuildRestoreUtility.GetUsingMicrosoftNETSdk(project.GetProperty("UsingMicrosoftNETSdk"));
+            NuGetVersion skdAnalysisLevel = MSBuildRestoreUtility.GetSdkAnalysisLevel(project.GetProperty("SdkAnalysisLevel"));
+
+            if (skdAnalysisLevel is not null)
+            {
+                restoreMetadata.SdkAnalysisLevel = skdAnalysisLevel;
+            }
 
             return (restoreMetadata, targetFrameworkInfos);
 

src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets

@@ -920,6 +920,8 @@ Copyright (c) .NET Foundation. All rights reserved.
         <NuGetAudit>$(NuGetAudit)</NuGetAudit>
         <NuGetAuditLevel>$(NuGetAuditLevel)</NuGetAuditLevel>
         <NuGetAuditMode>$(NuGetAuditMode)</NuGetAuditMode>
+        <SdkAnalysisLevel>$(SdkAnalysisLevel)</SdkAnalysisLevel>
+        <UsingMicrosoftNETSdk>$(UsingMicrosoftNETSdk)</UsingMicrosoftNETSdk>
       </_RestoreGraphEntry>
     </ItemGroup>
 

src/NuGet.Core/NuGet.Build.Tasks/Strings.resx

@@ -229,4 +229,4 @@
     <value>An error occurred starting static graph-based restore. {0}. Please file an issue at https://github.com/NuGet/Home</value>
     <comment>0 - The exception message</comment>
   </data>
-</root>
+</root>

src/NuGet.Core/NuGet.Commands/PublicAPI/net472/PublicAPI.Unshipped.txt

@@ -3,3 +3,5 @@ NuGet.Commands.UpdateSourceArgs.AllowInsecureConnections.set -> void
 NuGet.Commands.UpdateSourceArgs.AllowInsecureConnections.get -> bool
 NuGet.Commands.AddSourceArgs.AllowInsecureConnections.set -> void
 NuGet.Commands.AddSourceArgs.AllowInsecureConnections.get -> bool
+~static NuGet.Commands.MSBuildRestoreUtility.GetSdkAnalysisLevel(string sdkAnalysisLevel) -> NuGet.Versioning.NuGetVersion
+~static NuGet.Commands.MSBuildRestoreUtility.GetUsingMicrosoftNETSdk(string usingMicrosoftNETSdk) -> bool

src/NuGet.Core/NuGet.Commands/PublicAPI/netcoreapp5.0/PublicAPI.Unshipped.txt

@@ -3,3 +3,5 @@ NuGet.Commands.UpdateSourceArgs.AllowInsecureConnections.set -> void
 NuGet.Commands.UpdateSourceArgs.AllowInsecureConnections.get -> bool
 NuGet.Commands.AddSourceArgs.AllowInsecureConnections.set -> void
 NuGet.Commands.AddSourceArgs.AllowInsecureConnections.get -> bool
+~static NuGet.Commands.MSBuildRestoreUtility.GetSdkAnalysisLevel(string sdkAnalysisLevel) -> NuGet.Versioning.NuGetVersion
+~static NuGet.Commands.MSBuildRestoreUtility.GetUsingMicrosoftNETSdk(string usingMicrosoftNETSdk) -> bool

src/NuGet.Core/NuGet.Commands/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt

@@ -3,3 +3,5 @@ NuGet.Commands.UpdateSourceArgs.AllowInsecureConnections.set -> void
 NuGet.Commands.UpdateSourceArgs.AllowInsecureConnections.get -> bool
 NuGet.Commands.AddSourceArgs.AllowInsecureConnections.set -> void
 NuGet.Commands.AddSourceArgs.AllowInsecureConnections.get -> bool
+~static NuGet.Commands.MSBuildRestoreUtility.GetSdkAnalysisLevel(string sdkAnalysisLevel) -> NuGet.Versioning.NuGetVersion
+~static NuGet.Commands.MSBuildRestoreUtility.GetUsingMicrosoftNETSdk(string usingMicrosoftNETSdk) -> bool

src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/MSBuildRestoreUtility.cs

@@ -308,6 +308,13 @@ public static PackageSpec GetPackageSpec(IEnumerable<IMSBuildItem> items)
                 result.RestoreMetadata.CentralPackageVersionOverrideDisabled = isCentralPackageVersionOverrideDisabled;
                 result.RestoreMetadata.CentralPackageFloatingVersionsEnabled = isCentralPackageFloatingVersionsEnabled;
                 result.RestoreMetadata.CentralPackageTransitivePinningEnabled = isCentralPackageTransitivePinningEnabled;
+                result.RestoreMetadata.UsingMicrosoftNETSdk = MSBuildRestoreUtility.GetUsingMicrosoftNETSdk(specItem.GetProperty("UsingMicrosoftNETSdk"));
+                NuGetVersion sdkAnalysisLevel = MSBuildRestoreUtility.GetSdkAnalysisLevel(specItem.GetProperty("SdkAnalysisLevel")) ?? result.RestoreMetadata.SdkAnalysisLevel;
+
+                if (sdkAnalysisLevel is not null)
+                {
+                    result.RestoreMetadata.SdkAnalysisLevel = sdkAnalysisLevel;
+                }
             }
 
             return result;
@@ -941,6 +948,36 @@ public static RestoreAuditProperties GetRestoreAuditProperties(IMSBuildItem spec
             return null;
         }
 
+        public static NuGetVersion GetSdkAnalysisLevel(string sdkAnalysisLevel)
+        {
+            if (string.IsNullOrEmpty(sdkAnalysisLevel))
+            {
+                return null;
+            }
+
+            if (!NuGetVersion.TryParse(sdkAnalysisLevel, out NuGetVersion version))
+            {
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Strings.Invalid_AttributeValue, "SdkAnalysisLevel", sdkAnalysisLevel, "9.0.100"));
+            }
+
+            return version;
+        }
+
+        public static bool GetUsingMicrosoftNETSdk(string usingMicrosoftNETSdk)
+        {
+            if (string.IsNullOrEmpty(usingMicrosoftNETSdk))
+            {
+                return false;
+            }
+
+            if (!bool.TryParse(usingMicrosoftNETSdk, out var result))
+            {
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Strings.Invalid_AttributeValue, "UsingMicrosoftNETSdk", usingMicrosoftNETSdk, "false"));
+            }
+
+            return result;
+        }
+
         private static HashSet<string> GetAuditSuppressions(IEnumerable<IMSBuildItem> items)
         {
             IEnumerable<string> suppressions = GetItemByType(items, "NuGetAuditSuppress")

src/NuGet.Core/NuGet.Commands/Strings.resx

@@ -1121,4 +1121,10 @@ NuGet requires HTTPS sources. Please refer to https://aka.ms/nuget-https-everywh
 NuGet requires HTTPS sources. Please refer to https://aka.ms/nuget-https-everywhere for more information.</value>
     <comment>{0} - list of server URIs</comment>
   </data>
+  <data name="Invalid_AttributeValue" xml:space="preserve">
+    <value>The {0} value: `{1}` is invalid. Valid example: `{2}`</value>
+    <comment>{0} - is the attribute
+{1} is the invalid value of the attribute.
+{2} a valid attriibute value example</comment>
+  </data>
 </root>

src/NuGet.Core/NuGet.PackageManagement/Projects/ProjectBuildProperties.cs

@@ -63,5 +63,7 @@ public static class ProjectBuildProperties
         public const string NuGetAuditLevel = nameof(NuGetAuditLevel);
         public const string NuGetAuditMode = nameof(NuGetAuditMode);
         public const string CentralPackageFloatingVersionsEnabled = nameof(CentralPackageFloatingVersionsEnabled);
+        public const string SdkAnalysisLevel = nameof(SdkAnalysisLevel);
+        public const string UsingMicrosoftNETSdk = nameof(UsingMicrosoftNETSdk);
     }
 }

src/NuGet.Core/NuGet.PackageManagement/PublicAPI.Unshipped.txt

@@ -1 +1,3 @@
 #nullable enable
+~const NuGet.ProjectManagement.ProjectBuildProperties.SdkAnalysisLevel = "SdkAnalysisLevel" -> string
+~const NuGet.ProjectManagement.ProjectBuildProperties.UsingMicrosoftNETSdk = "UsingMicrosoftNETSdk" -> string

src/NuGet.Core/NuGet.ProjectModel/JsonPackageSpecReader.Utf8JsonStreamReader.cs

@@ -109,6 +109,8 @@ public partial class JsonPackageSpecReader
         private static readonly byte[] HashTagImportPropertyName = Encoding.UTF8.GetBytes("#import");
         private static readonly byte[] ProjectReferencesPropertyName = Encoding.UTF8.GetBytes("projectReferences");
         private static readonly byte[] EmptyStringPropertyName = Encoding.UTF8.GetBytes(string.Empty);
+        private static readonly byte[] SdkAnalysisLevel = Encoding.UTF8.GetBytes("SdkAnalysisLevel");
+        private static readonly byte[] UsingMicrosoftNETSdk = Encoding.UTF8.GetBytes("UsingMicrosoftNETSdk");
 
         internal static PackageSpec GetPackageSpecUtf8JsonStreamReader(Stream stream, string name, string packageSpecPath, IEnvironmentVariableReader environmentVariableReader, string snapshotValue = null)
         {
@@ -945,6 +947,8 @@ private static void ReadMSBuildMetadata(ref Utf8JsonStreamReader jsonReader, Pac
             RestoreAuditProperties auditProperties = null;
             bool useMacros = MSBuildStringUtility.IsTrue(environmentVariableReader.GetEnvironmentVariable(MacroStringsUtility.NUGET_ENABLE_EXPERIMENTAL_MACROS));
             var userSettingsDirectory = NuGetEnvironment.GetFolderPath(NuGetFolderPath.UserSettingsDirectory);
+            bool usingMicrosoftNetSdk = true;
+            NuGetVersion sdkAnalysisLevel = null;
 
             if (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.StartObject)
             {
@@ -1169,6 +1173,32 @@ private static void ReadMSBuildMetadata(ref Utf8JsonStreamReader jsonReader, Pac
 
                         warningProperties = new WarningProperties(warnAsError, noWarn, allWarningsAsErrors, warningsNotAsErrors);
                     }
+                    else if (jsonReader.ValueTextEquals(UsingMicrosoftNETSdk))
+                    {
+                        usingMicrosoftNetSdk = jsonReader.ReadNextTokenAsBoolOrTrue(UsingMicrosoftNETSdk);
+                    }
+                    else if (jsonReader.ValueTextEquals(SdkAnalysisLevel))
+                    {
+                        string sdkAnalysisLevelString = jsonReader.ReadNextTokenAsString();
+
+                        if (!string.IsNullOrEmpty(sdkAnalysisLevelString))
+                        {
+                            try
+                            {
+                                sdkAnalysisLevel = new NuGetVersion(sdkAnalysisLevelString);
+                            }
+                            catch (ArgumentException ex)
+                            {
+                                throw new ArgumentException(
+                                    string.Format(CultureInfo.CurrentCulture,
+                                    Strings.Invalid_AttributeValue,
+                                    Encoding.UTF8.GetString(SdkAnalysisLevel),
+                                    sdkAnalysisLevelString,
+                                    "9.0.100"),
+                                    ex);
+                            }
+                        }
+                    }
                     else
                     {
                         jsonReader.Skip();
@@ -1193,6 +1223,8 @@ private static void ReadMSBuildMetadata(ref Utf8JsonStreamReader jsonReader, Pac
             msbuildMetadata.CentralPackageVersionOverrideDisabled = centralPackageVersionOverrideDisabled;
             msbuildMetadata.CentralPackageTransitivePinningEnabled = CentralPackageTransitivePinningEnabled;
             msbuildMetadata.RestoreAuditProperties = auditProperties;
+            msbuildMetadata.SdkAnalysisLevel = sdkAnalysisLevel;
+            msbuildMetadata.UsingMicrosoftNETSdk = usingMicrosoftNetSdk;
 
             if (configFilePaths != null)
             {

src/NuGet.Core/NuGet.ProjectModel/JsonPackageSpecReader.cs

@@ -953,6 +953,8 @@ private static void ReadMSBuildMetadata(JsonTextReader jsonReader, PackageSpec p
             RestoreAuditProperties auditProperties = null;
             bool useMacros = MSBuildStringUtility.IsTrue(environmentVariableReader.GetEnvironmentVariable(MacroStringsUtility.NUGET_ENABLE_EXPERIMENTAL_MACROS));
             var userSettingsDirectory = NuGetEnvironment.GetFolderPath(NuGetFolderPath.UserSettingsDirectory);
+            bool usingMicrosoftNetSdk = true;
+            NuGetVersion sdkAnalysisLevel = null;
 
             jsonReader.ReadObject(propertyName =>
             {
@@ -1154,6 +1156,39 @@ private static void ReadMSBuildMetadata(JsonTextReader jsonReader, PackageSpec p
 
                         warningProperties = new WarningProperties(warnAsError, noWarn, allWarningsAsErrors, warningsNotAsErrors);
                         break;
+                    case "SdkAnalysisLevel":
+                        string skdAnalysisLevelString = jsonReader.ReadNextTokenAsString();
+
+                        if (!string.IsNullOrEmpty(skdAnalysisLevelString))
+                        {
+                            try
+                            {
+                                sdkAnalysisLevel = new NuGetVersion(skdAnalysisLevelString);
+                            }
+                            catch (ArgumentException ex)
+                            {
+                                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, Strings.Invalid_AttributeValue, "SdkAnalysisLevel", skdAnalysisLevelString, "9.0.100"), ex);
+                            }
+                        }
+                        break;
+
+                    case "UsingMicrosoftNETSdk":
+
+                        try
+                        {
+                            usingMicrosoftNetSdk = jsonReader.ReadAsBoolean() ?? usingMicrosoftNetSdk;
+                        }
+                        catch (ArgumentException ex)
+                        {
+                            throw new ArgumentException(
+                                string.Format(
+                                    CultureInfo.CurrentCulture,
+                                    Strings.Invalid_AttributeValue,
+                                    "UsingMicrosoftNETSdk",
+                                    jsonReader.ReadNextTokenAsString(),
+                                    "false"), ex);
+                        }
+                        break;
                 }
             });
 
@@ -1174,6 +1209,8 @@ private static void ReadMSBuildMetadata(JsonTextReader jsonReader, PackageSpec p
             msbuildMetadata.CentralPackageVersionOverrideDisabled = centralPackageVersionOverrideDisabled;
             msbuildMetadata.CentralPackageTransitivePinningEnabled = CentralPackageTransitivePinningEnabled;
             msbuildMetadata.RestoreAuditProperties = auditProperties;
+            msbuildMetadata.UsingMicrosoftNETSdk = usingMicrosoftNetSdk;
+            msbuildMetadata.SdkAnalysisLevel = sdkAnalysisLevel;
 
             if (configFilePaths != null)
             {

src/NuGet.Core/NuGet.ProjectModel/PackageSpecWriter.cs

@@ -65,7 +65,6 @@ internal static void Write(PackageSpec packageSpec, IObjectWriter writer, bool h
             SetDictionaryValues(writer, "scripts", packageSpec.Scripts);
 #pragma warning restore CS0612 // Type or member is obsolete
 
-
             if (packageSpec.Dependencies.Count > 0)
             {
                 SetDependencies(writer, packageSpec.Dependencies);
@@ -188,6 +187,11 @@ private static void SetMSBuildMetadata(IObjectWriter writer, PackageSpec package
                 SetValue(writer, "packagesConfigPath", pcMsbuildMetadata.PackagesConfigPath);
             }
 
+            if (packageSpec.RestoreMetadata.SdkAnalysisLevel is not null)
+            {
+                SetValue(writer, "SdkAnalysisLevel", packageSpec.RestoreMetadata.SdkAnalysisLevel.ToString());
+            }
+
             writer.WriteObjectEnd();
         }
 
@@ -210,6 +214,7 @@ private static void WriteMetadataBooleans(IObjectWriter writer, ProjectRestoreMe
             SetValueIfTrue(writer, "centralPackageFloatingVersionsEnabled", msbuildMetadata.CentralPackageFloatingVersionsEnabled);
             SetValueIfTrue(writer, "centralPackageVersionOverrideDisabled", msbuildMetadata.CentralPackageVersionOverrideDisabled);
             SetValueIfTrue(writer, "CentralPackageTransitivePinningEnabled", msbuildMetadata.CentralPackageTransitivePinningEnabled);
+            SetValueIfFalse(writer, "UsingMicrosoftNETSdk", msbuildMetadata.UsingMicrosoftNETSdk);
         }
 
 
@@ -694,6 +699,14 @@ private static void SetValueIfTrue(IObjectWriter writer, string name, bool value
             }
         }
 
+        private static void SetValueIfFalse(IObjectWriter writer, string name, bool value)
+        {
+            if (!value)
+            {
+                writer.WriteNameValue(name, value);
+            }
+        }
+
         private static void SetValueIfNotNull(IObjectWriter writer, string name, string value)
         {
             if (!string.IsNullOrEmpty(value))