Revert "Multi target type reuse (#5300)"

This reverts commit 24ce1fd.

src/dotnet-svcutil/lib/src/Bootstrapper/SvcutilBootstrapper.cs

@@ -123,17 +123,22 @@ internal async Task GenerateProjectAsync(bool keepBootstrapperDir, ILogger logge
                 this.MSBuildProj = await MSBuildProj.DotNetNewAsync(projectFullPath, logger, cancellationToken).ConfigureAwait(false);
                 this.MSBuildProj.AddDependency(svcutilPkgRef, true);
 
-                var targetFramework = frameworkInfo.FullName;
-                if (isSupportedTFM && frameworkInfo.Name != FrameworkInfo.Netstandard && frameworkInfo.Version.CompareTo(new Version(6, 0)) >= 0)
-                {
-                    this.MSBuildProj.TargetFramework = targetFramework;
-                    if(targetFramework.ToLowerInvariant().Contains("net7.0-windows10"))
-                    {
-                        this.MSBuildProj.SetEnableMsixTooling();
-                    }
-                }
+                // Comment out code below for reasons: 1. it never used for .net core later than V2.1 since when the approach is always use TF from the generated project.
+                // 2. with below code applied when target framework is netstandard2.0 client machine require netcoreapp2.0 (obsolete) for bootstrapper to work
+                // 3. keep it here for future reference in case when we need definite bootstrapper TF version
+
+                // NOTE: If post v2.0 NetStandard ships a different version from NetCore the table below needs to be updated!
+                //var targetFramework = frameworkInfo.FullName;
+                //if (isSupportedTFM && frameworkInfo.IsKnownDnx)
+                //{
+                //    if (frameworkInfo.Name == FrameworkInfo.Netstandard)
+                //    {
+                //        targetFramework = FrameworkInfo.Netcoreapp + TargetFrameworkHelper.NetStandardToNetCoreVersionMap[frameworkInfo.Version];
+                //    }
+                //    this.MSBuildProj.TargetFramework = targetFramework;
+                //}
                 // else
-                // The TFM is Netstandard or version lower than 6.0 or unknown: either, it was not provided or it is a version not yet known to the tool,
+                // The TFM is unknown: either, it was not provided or it is a version not yet known to the tool,
                 // we will use the default TF from the generated project.
             }
 

src/dotnet-svcutil/lib/src/CodeDomFixup/WcfCodeGenerationExtension.cs

@@ -62,7 +62,7 @@ public void WsdlImported(WsdlImporter importer, Collection<ServiceEndpoint> endp
 
             foreach (var binding in bindings)
             {
-                if (binding is NetNamedPipeBinding && _options.Project != null && !_options.Project.TargetFrameworks.Any(t => t.ToLower().Contains("windows")))
+                if (binding is NetNamedPipeBinding && _options.Project != null && !_options.Project.TargetFrameworks.FirstOrDefault().ToLower().Contains("windows"))
                 {
                     MetadataConversionError error = new MetadataConversionError(SR.WrnTargetFrameworkNotSupported_NetNamedPipe, isWarning: true);
                     if (!importer.Errors.Contains(error))

src/dotnet-svcutil/lib/src/Shared/FrameworkInfo.cs

@@ -40,7 +40,6 @@ public static FrameworkInfo Parse(string fullFrameworkName)
             // framework spec form: 'net5.0'
             // framework spec form: '.NETCoreApp,Version=v6.0'
             // framework spec form: '.NETFramework,Version=v4.8'
-            // framework spec form: 'net7.0-windows10.0.19041.0', 'net7.0-windows'
             for (int i = 0; i < fullFrameworkName.Length; i++)
             {
                 char c = fullFrameworkName[i];
@@ -50,25 +49,17 @@ public static FrameworkInfo Parse(string fullFrameworkName)
 
                     // Version ctr requires at least Major and Minor parts
                     string versionString = fullFrameworkName.Substring(i);
-                    if ((name == Netfx))
+                    if ((name == Netfx) && !versionString.Contains("."))
                     {
                         // net452
-                        if(!versionString.Contains("."))
+                        StringBuilder sb = new StringBuilder(versionString);
+                        for (int j = 1; j < sb.Length; j += 2)
                         {
-                            StringBuilder sb = new StringBuilder(versionString);
-                            for (int j = 1; j < sb.Length; j += 2)
-                            {
-                                sb.Insert(j, '.');
-                            }
-                            versionString = sb.ToString();
+                            sb.Insert(j, '.');
                         }
-                        // net7.0-windows10.0.19041.0
-                        if (versionString.Contains("-"))
-                        {
-                            versionString = versionString.Substring(0, versionString.IndexOf("-"));
-                        }                        
+                        versionString = sb.ToString();
                     }
-                    
+
                     version = new Version(versionString);
                     break;
                 }

src/dotnet-svcutil/lib/src/Shared/MSBuildProj.cs

@@ -221,9 +221,14 @@ public static async Task<MSBuildProj> ParseAsync(string projectText, string proj
                     if (targetFrameworksElements.Count() > 0)
                     {
                         var targetFrameworks = targetFrameworksElements.Last().Value;
+                        if (targetFrameworks.ToString().StartsWith("$"))
+                        {
+                            targetFrameworks = GetValueFromDirBuildProps(targetFrameworks, msbuildProj.DirectoryPath);
+                        }
+
                         foreach (var targetFx in targetFrameworks.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries).Select(p => p.Trim()))
                         {
-                            if (!string.IsNullOrEmpty(targetFx) && !targetFx.ToString().StartsWith("$"))
+                            if (!string.IsNullOrWhiteSpace(targetFx))
                             {
                                 msbuildProj._targetFrameworks.Add(targetFx);
                             }
@@ -586,14 +591,6 @@ public bool AddDependency(ProjectDependency dependency, bool copyInternalAssets
             return addDependency;
         }
 
-        public void SetEnableMsixTooling()
-        {
-            // workaround for https://github.com/microsoft/WindowsAppSDK/issues/3548: dotnet build fails when WindowsAppSDK is referenced in console application.
-            // affects MAUI project targeting net7.0-windows10.0xxx, not reproduce in net8.0-window10.0xxx
-            // ref: https://github.com/dotnet/maui/issues/5886
-            SetPropertyValue("EnableMsixTooling", "true");
-        }
-
         // Sets the property value in a PropertyGroup. Returns true if the value was changed, and false if it was already set to that value.
         private bool SetPropertyValue(string propertyName, string value)
         {
@@ -762,7 +759,7 @@ public async Task<IEnumerable<ProjectDependency>> ResolveProjectReferencesAsync(
 
             using (var safeLogger = await SafeLogger.WriteStartOperationAsync(logger, "Resolving project references ...").ConfigureAwait(false))
             {
-                if (_targetFrameworks.Count >= 1 && TargetFrameworkHelper.IsSupportedFramework(this.TargetFramework, out var frameworkInfo) && frameworkInfo.IsDnx)
+                if (_targetFrameworks.Count == 1 && TargetFrameworkHelper.IsSupportedFramework(this.TargetFramework, out var frameworkInfo) && frameworkInfo.IsDnx)
                 {
                     await this.RestoreAsync(logger, cancellationToken).ConfigureAwait(false);
 
@@ -797,17 +794,15 @@ await AsyncHelper.RunAsync(async () =>
                     try
                     {
                         var assetsFile = new FileInfo(Path.Combine(this.DirectoryPath, "obj", "project.assets.json")).FullName;
-                        if (File.Exists(assetsFile) && !(this.TargetFramework.Contains("-") && !this.TargetFramework.ToLower().Contains("windows")))
+                        if (File.Exists(assetsFile))
                         {
                             LockFile lockFile = LockFileUtilities.GetLockFile(assetsFile, logger as NuGet.Common.ILogger);
+
                             if (lockFile != null)
                             {
-                                LockFileTarget target = lockFile.Targets.Count == 1 ? lockFile.Targets[0] : lockFile.Targets.FirstOrDefault(t =>
-                                t.Name.StartsWith(this.TargetFramework, StringComparison.InvariantCultureIgnoreCase) //this.TargetFramework:net7.0-windows, targets:net7.0-windows7.0
-                                || this.TargetFramework.StartsWith(t.Name, StringComparison.InvariantCultureIgnoreCase));//this.TargetFramework:net7.0-windows10.0.19041.0, targets:net7.0-windows10.0.19041
-                                if (target != null)
+                                if (lockFile.Targets.Count == 1)
                                 {
-                                    foreach (var lib in target.Libraries)
+                                    foreach (var lib in lockFile.Targets[0].Libraries)
                                     {
                                         bool isPackage = StringComparer.OrdinalIgnoreCase.Compare(lib.Type, "package") == 0;
 
@@ -975,7 +970,7 @@ public async Task<IEnumerable<KeyValuePair<string, string>>> ResolveProperyValue
 
                 if (propertyTable.Count() != propertyNames.Count())
                 {
-                    propertyTable = await _propertyResolver.EvaluateProjectPropertiesAsync(this.FullPath, this.TargetFramework, propertyNames, this.GlobalProperties, logger, cancellationToken).ConfigureAwait(false);
+                    propertyTable = await _propertyResolver.EvaluateProjectPropertiesAsync(this.FullPath, this.TargetFrameworks.FirstOrDefault(), propertyNames, this.GlobalProperties, logger, cancellationToken).ConfigureAwait(false);
 
                     foreach (var entry in propertyTable)
                     {
@@ -1005,7 +1000,7 @@ private async Task<string> ResolveDepsFilePathFromBuildConfigAsync(string output
                 {
                     var depsFiles = Directory.GetFiles(binFolder, "*", SearchOption.AllDirectories)
                         .Where(d => Path.GetFileName(d).Equals(fileName, RuntimeEnvironmentHelper.FileStringComparison))
-                        .Where(f => PathHelper.GetFolderName(Path.GetDirectoryName(f)) == this.TargetFramework || Directory.GetParent(Directory.GetParent(f).FullName).Name == this.TargetFramework)
+                        .Where(f => PathHelper.GetFolderName(Path.GetDirectoryName(f)) == this.TargetFrameworks.FirstOrDefault())
                         .Select(f => new FileInfo(f))
                         .OrderByDescending(f => f.CreationTimeUtc);
 

src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs

@@ -150,6 +150,11 @@ public static string GetBestFitTargetFramework(IEnumerable<string> targetFramewo
                 }
             }
 
+            if (fxInfo != null)
+            {
+                return fxInfo.FullName;
+            }
+
             return targetFramework;
         }
 
@@ -207,6 +212,12 @@ public static bool IsSupportedFramework(string fullFrameworkName, out FrameworkI
         {
             bool isSupported = false;
 
+            var tfx = fullFrameworkName.Split('-');
+            if (tfx.Length > 1)
+            {
+                fullFrameworkName = tfx[0];
+            }
+
             if (FrameworkInfo.TryParse(fullFrameworkName, out frameworkInfo))
             {
                 isSupported = (frameworkInfo.Name == FrameworkInfo.Netstandard && frameworkInfo.Version >= MinSupportedNetStandardVersion) ||