diff --git a/src/dotnet-svcutil/lib/src/Shared/FrameworkInfo.cs b/src/dotnet-svcutil/lib/src/Shared/FrameworkInfo.cs index cbba8c2ffe4..1a43ec54892 100644 --- a/src/dotnet-svcutil/lib/src/Shared/FrameworkInfo.cs +++ b/src/dotnet-svcutil/lib/src/Shared/FrameworkInfo.cs @@ -14,6 +14,7 @@ internal class FrameworkInfo public const string Netstandard = "netstandard"; public const string Netcoreapp = "netcoreapp"; public const string Netfx = "net"; + public const string Netframework = "netframework"; public const string Netversion = "version"; private FrameworkInfo() @@ -40,6 +41,7 @@ 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: '.NETStandard,Version=v2.0' // framework spec form: 'net7.0-windows10.0.19041.0', 'net7.0-windows' for (int i = 0; i < fullFrameworkName.Length; i++) { @@ -76,16 +78,24 @@ public static FrameworkInfo Parse(string fullFrameworkName) if (name.ToLower().Contains(Netversion)) { - //netcoreapp3.1 and lower - if (version.Major < 4) + //TFMoniker form ".NETStandard,Version=v2.0" resolves to framework name "netstandard." + if (name.ToLower().Contains(Netstandard)) { - name = Netcoreapp; + name = Netstandard; } - else + //TFMoniker form ".NETFramework,Version=v4.8" resolves to framework name "net" + //TFMoniker form ".NETCoreApp,Version=v6.0" resolves to framework name "net" + else if (name.ToLower().Contains(Netframework) || version.Major >= 5) { name = Netfx; } + //TFMoniker form ".NETCoreApp,Version=v3.1" resolves to framework name "netcoreapp" + else + { + name = Netcoreapp; + } + fullFrameworkName = string.Concat(name, version.ToString()); } @@ -101,8 +111,8 @@ public static FrameworkInfo Parse(string fullFrameworkName) fxInfo.Version = version; fxInfo.IsDnx = name == Netstandard || name == Netcoreapp || version.Major >= 5; fxInfo.IsKnownDnx = fxInfo.IsDnx && - (TargetFrameworkHelper.NetStandardToNetCoreVersionMap.Keys.Any((netstdVersion) => netstdVersion == version) || - TargetFrameworkHelper.NetStandardToNetCoreVersionMap.Values.Any((netcoreVersion) => netcoreVersion == version)); + ((name == Netstandard && TargetFrameworkHelper.NetStandardToNetCoreVersionMap.Keys.Any((netstdVersion) => netstdVersion == version)) || + (name != Netstandard && TargetFrameworkHelper.NetCoreToWCFPackageReferenceVersionMap.Keys.Any((netcoreVersion) => netcoreVersion == version))); return fxInfo; } diff --git a/src/dotnet-svcutil/lib/src/Shared/MSBuildProj.cs b/src/dotnet-svcutil/lib/src/Shared/MSBuildProj.cs index 472937eef3b..9460a0b9eca 100644 --- a/src/dotnet-svcutil/lib/src/Shared/MSBuildProj.cs +++ b/src/dotnet-svcutil/lib/src/Shared/MSBuildProj.cs @@ -134,14 +134,12 @@ private XElement PacakgeReferenceGroup _packageReferenceGroup = refItems.FirstOrDefault().Parent; } - FrameworkInfo netfxInfo = null; - FrameworkInfo dnxInfo = null; - if (this.TargetFrameworks.Count() > 1 && this.TargetFrameworks.Any(t => TargetFrameworkHelper.IsSupportedFramework(t, out netfxInfo) && !netfxInfo.IsDnx)) + if (this.TargetFrameworks.Count() > 1 && this.TargetFrameworks.Any(t => TargetFrameworkHelper.IsSupportedFramework(t, out FrameworkInfo netfxInfo) && !netfxInfo.IsDnx)) { - var tfx = this.TargetFrameworks.FirstOrDefault(t => TargetFrameworkHelper.IsSupportedFramework(t, out dnxInfo) && dnxInfo.IsDnx); - if (!string.IsNullOrEmpty(tfx) && dnxInfo.Version.Major >= 6) + Version ver = TargetFrameworkHelper.GetLowestNetCoreVersion(this.TargetFrameworks); + if (ver != null && ver.Major >= 6) { - _packageReferenceGroup.Add(new XAttribute("Condition", $"'$(TargetFramework)' != '{netfxInfo.FullName}'")); + _packageReferenceGroup.Add(new XAttribute("Condition", $"!$(TargetFramework.StartsWith('net4'))")); } } } @@ -541,15 +539,13 @@ public bool AddDependency(ProjectDependency dependency, bool copyInternalAssets this.ProjectReferceGroup.Add(new XElement("ProjectReference", new XAttribute("Include", dependency.FullPath))); break; case ProjectDependencyType.Binary: - FrameworkInfo netfxInfo = null; - FrameworkInfo dnxInfo = null; - string dnxStr = this.TargetFrameworks.FirstOrDefault(t => TargetFrameworkHelper.IsSupportedFramework(t, out dnxInfo) && dnxInfo.IsDnx); + Version ver = TargetFrameworkHelper.GetLowestNetCoreVersion(this.TargetFrameworks); if (this.TargetFrameworks.Count() > 1 && dependency.Name.Equals(TargetFrameworkHelper.FullFrameworkReferences.FirstOrDefault().Name) - && !string.IsNullOrWhiteSpace(dnxStr) && dnxInfo.Version.Major >= 6) + && ver != null && ver.Major >= 6) { - if (this.TargetFrameworks.Any(t => TargetFrameworkHelper.IsSupportedFramework(t, out netfxInfo) && !netfxInfo.IsDnx)) + if (this.TargetFrameworks.Any(t => TargetFrameworkHelper.IsSupportedFramework(t, out FrameworkInfo netfxInfo) && !netfxInfo.IsDnx)) { - this.ReferenceGroup.Add(new XElement("Reference", new XAttribute("Condition", $"'$(TargetFramework)' == '{netfxInfo.FullName}'"), new XAttribute("Include", dependency.AssemblyName), new XElement("HintPath", dependency.FullPath))); + this.ReferenceGroup.Add(new XElement("Reference", new XAttribute("Condition", $"$(TargetFramework.StartsWith('net4'))"), new XAttribute("Include", dependency.AssemblyName), new XElement("HintPath", dependency.FullPath))); } } else diff --git a/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs b/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs index 92e796bd428..6c850f903a9 100644 --- a/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs +++ b/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs @@ -21,76 +21,44 @@ internal class TargetFrameworkHelper {new Version("1.5"), new Version("1.0") }, {new Version("1.6"), new Version("1.0") }, {new Version("1.6.1"), new Version("1.1") }, - {new Version("2.0"), new Version("2.0") } + {new Version("2.0"), new Version("2.0") }, + {new Version("2.1"), new Version("3.1") } + }); + + public static ReadOnlyDictionary NetCoreToWCFPackageReferenceVersionMap { get; } = new ReadOnlyDictionary(new SortedDictionary + { + {new Version("1.0"), new Version("2.0") }, + {new Version("1.1"), new Version("2.0") }, + {new Version("2.0"), new Version("2.0") }, + {new Version("2.1"), new Version("2.0") }, + {new Version("2.2"), new Version("2.0") }, + {new Version("3.0"), new Version("2.0") }, + {new Version("3.1"), new Version("2.0") }, + {new Version("5.0"), new Version("2.0") }, + {new Version("6.0"), new Version("6.0") }, + {new Version("7.0"), new Version("6.0") }, + {new Version("8.0"), new Version("8.0") } }); internal static SortedDictionary> NetCoreVersionReferenceTable = new SortedDictionary> { - {new Version("1.0"), new List { - ProjectDependency.FromPackage("System.ServiceModel.Duplex", "4.0.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Http", "4.1.*" ), - ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.1.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Security", "4.0.*"), - ProjectDependency.FromPackage("System.Xml.XmlSerializer", "4.0.*" ), - } }, - {new Version("1.1"), new List { - ProjectDependency.FromPackage("System.ServiceModel.Duplex", "4.3.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Http", "4.3.*" ), - ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.3.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Security", "4.3.*"), - ProjectDependency.FromPackage("System.Xml.XmlSerializer", "4.3.*" ), - } }, {new Version("2.0"), new List { - ProjectDependency.FromPackage("System.ServiceModel.Duplex", "4.4.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Http", "4.4.*" ), - ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.4.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Security", "4.4.*"), - } }, - {new Version("2.1"), new List { - ProjectDependency.FromPackage("System.ServiceModel.Duplex", "4.6.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Http", "4.6.*" ), - ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.6.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Security", "4.6.*"), - } }, - {new Version("3.1"), new List { - ProjectDependency.FromPackage("System.ServiceModel.Duplex", "4.7.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Http", "4.7.*" ), - ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.7.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Security", "4.7.*"), - } }, - {new Version("5.0"), new List { - ProjectDependency.FromPackage("System.ServiceModel.Duplex", "4.8.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Http", "4.8.*" ), - ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.8.*" ), - ProjectDependency.FromPackage("System.ServiceModel.Security", "4.8.*"), - ProjectDependency.FromPackage("System.ServiceModel.Federation", "4.8.*") + ProjectDependency.FromPackage("System.ServiceModel.Duplex", "4.10.*" ), + ProjectDependency.FromPackage("System.ServiceModel.Http", "4.10.*" ), + ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.10.*" ), + ProjectDependency.FromPackage("System.ServiceModel.Security", "4.10.*"), + ProjectDependency.FromPackage("System.ServiceModel.Federation", "4.10.*") } }, {new Version("6.0"), new List { - ProjectDependency.FromPackage("System.ServiceModel.Http", "6.2.*"), - ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "6.2.*"), - ProjectDependency.FromPackage("System.ServiceModel.NetNamedPipe", "6.2.*"), - ProjectDependency.FromPackage("System.ServiceModel.Primitives", "6.2.*"), - ProjectDependency.FromPackage("System.ServiceModel.Federation", "6.2.*"), - ProjectDependency.FromPackage("System.ServiceModel.UnixDomainSocket", "6.2.*"), - ProjectDependency.FromPackage("System.Web.Services.Description", "6.2.*") - } }, - {new Version("7.0"), new List { - ProjectDependency.FromPackage("System.ServiceModel.Http", "6.2.*"), - ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "6.2.*"), - ProjectDependency.FromPackage("System.ServiceModel.NetNamedPipe", "6.2.*"), - ProjectDependency.FromPackage("System.ServiceModel.Primitives", "6.2.*"), - ProjectDependency.FromPackage("System.ServiceModel.Federation", "6.2.*"), - ProjectDependency.FromPackage("System.ServiceModel.UnixDomainSocket", "6.2.*"), - ProjectDependency.FromPackage("System.Web.Services.Description", "6.2.*") + ProjectDependency.FromPackage("System.ServiceModel.Http", "6.*"), + ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "6.*"), + ProjectDependency.FromPackage("System.ServiceModel.Primitives", "6.*") } }, {new Version("8.0"), new List { ProjectDependency.FromPackage("System.ServiceModel.Http", "8.*"), ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "8.*"), - ProjectDependency.FromPackage("System.ServiceModel.NetNamedPipe", "8.*"), - ProjectDependency.FromPackage("System.ServiceModel.Primitives", "8.*"), - ProjectDependency.FromPackage("System.ServiceModel.Federation", "8.*"), - ProjectDependency.FromPackage("System.ServiceModel.UnixDomainSocket", "8.*"), - ProjectDependency.FromPackage("System.Web.Services.Description", "8.*") + ProjectDependency.FromPackage("System.ServiceModel.Primitives", "8.*") + } } }; @@ -118,27 +86,17 @@ internal class TargetFrameworkHelper public static Version MinSupportedNetStandardVersion { get; } = NetStandardToNetCoreVersionMap.Keys.First(); public static Version MinSupportedNetCoreAppVersion { get; } = NetStandardToNetCoreVersionMap.Values.First(); - public static IEnumerable GetWcfProjectReferences(string targetFramework) + public static IEnumerable GetWcfProjectReferences(IEnumerable targetFrameworks) { IEnumerable dependencies = null; - - if (IsSupportedFramework(targetFramework, out var frameworkInfo)) + Version version = GetLowestNetCoreVersion(targetFrameworks); + if (version != null) { - if (frameworkInfo.IsDnx) - { - if (NetCoreVersionReferenceTable.ContainsKey(frameworkInfo.Version)) - { - dependencies = NetCoreVersionReferenceTable[frameworkInfo.Version]; - } - else - { - dependencies = NetCoreVersionReferenceTable.Last().Value; - } - } - else - { - dependencies = FullFrameworkReferences; - } + dependencies = NetCoreVersionReferenceTable[NetCoreToWCFPackageReferenceVersionMap[version]]; + } + else + { + dependencies = FullFrameworkReferences; } return dependencies; @@ -181,26 +139,32 @@ public static Version GetLowestNetCoreVersion(IEnumerable targetFramewor if (TargetFrameworkHelper.IsSupportedFramework(targetFramework, out var frameworkInfo) && frameworkInfo.IsDnx) { Version netCoreVersion; - if (frameworkInfo.IsKnownDnx) { - netCoreVersion = frameworkInfo.Name == FrameworkInfo.Netstandard ? - TargetFrameworkHelper.NetStandardToNetCoreVersionMap[frameworkInfo.Version] : - frameworkInfo.Version; - } - else - { - // target framework is not the minumum standard supported netcore version but it is a known shipped netcore version. - if (TargetFrameworkHelper.NetCoreVersionReferenceTable.ContainsKey(frameworkInfo.Version)) + if (frameworkInfo.Name == FrameworkInfo.Netstandard) { - netCoreVersion = frameworkInfo.Version; + if (!NetStandardToNetCoreVersionMap.TryGetValue(frameworkInfo.Version, out netCoreVersion)) + { + netCoreVersion = NetStandardToNetCoreVersionMap.LastOrDefault().Value; + } } else { - // target framework is not known to the tool, use the latest known netcore version. - netCoreVersion = TargetFrameworkHelper.NetCoreVersionReferenceTable.Keys.LastOrDefault(); + if (NetCoreToWCFPackageReferenceVersionMap.TryGetValue(frameworkInfo.Version, out Version version)) + { + netCoreVersion = frameworkInfo.Version; + } + else + { + netCoreVersion = NetCoreToWCFPackageReferenceVersionMap.Keys.LastOrDefault(); + } } } + else + { + // target framework is not known to the tool, use the latest known netcore version. + netCoreVersion = NetCoreToWCFPackageReferenceVersionMap.Keys.LastOrDefault(); + } if (targetVersion == null || targetVersion > netCoreVersion) { diff --git a/src/dotnet-svcutil/lib/src/Tool.cs b/src/dotnet-svcutil/lib/src/Tool.cs index 175da8f53c0..779bca3f47e 100644 --- a/src/dotnet-svcutil/lib/src/Tool.cs +++ b/src/dotnet-svcutil/lib/src/Tool.cs @@ -272,7 +272,7 @@ private static async Task AddProjectReferencesAsync(MSBuildProj project, C { try { - var dependencies = TargetFrameworkHelper.GetWcfProjectReferences(project.TargetFramework); + var dependencies = TargetFrameworkHelper.GetWcfProjectReferences(project.TargetFrameworks); if (dependencies != null) { bool needSave = false; @@ -289,8 +289,8 @@ private static async Task AddProjectReferencesAsync(MSBuildProj project, C if (project.TargetFrameworks.Count() > 1 && project.TargetFrameworks.Any(t => TargetFrameworkHelper.IsSupportedFramework(t, out FrameworkInfo fxInfo) && !fxInfo.IsDnx)) { FrameworkInfo fxInfo = null; - var tfx = project.TargetFrameworks.FirstOrDefault(t => TargetFrameworkHelper.IsSupportedFramework(t, out fxInfo) && fxInfo.IsDnx); - if (!string.IsNullOrEmpty(tfx) && fxInfo.Version.Major >= 6) + Version ver = TargetFrameworkHelper.GetLowestNetCoreVersion(project.TargetFrameworks); + if (ver != null && ver.Major >= 6) { needSave |= project.AddDependency(TargetFrameworkHelper.FullFrameworkReferences.FirstOrDefault()); } diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/listDictionary/listDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/listDictionary/listDictionary.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/listDictionary/listDictionary.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/listDictionary/listDictionary.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/observableCollection/observableCollection.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/observableCollection/observableCollection.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/observableCollection/observableCollection.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/observableCollection/observableCollection.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/orderedDictionary/orderedDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/orderedDictionary/orderedDictionary.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/orderedDictionary/orderedDictionary.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/orderedDictionary/orderedDictionary.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedDictionary/sortedDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedDictionary/sortedDictionary.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedDictionary/sortedDictionary.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedDictionary/sortedDictionary.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedList/sortedList.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedList/sortedList.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedList/sortedList.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedList/sortedList.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedListNonGeneric/sortedListNonGeneric.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedListNonGeneric/sortedListNonGeneric.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedListNonGeneric/sortedListNonGeneric.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedListNonGeneric/sortedListNonGeneric.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/mexParam/mexParam.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/mexParam/mexParam.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/mexParam/mexParam.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/mexParam/mexParam.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/noQuery/noQuery.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/noQuery/noQuery.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/noQuery/noQuery.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/noQuery/noQuery.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/singleWsdlQuery/singleWsdlQuery.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/singleWsdlQuery/singleWsdlQuery.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/singleWsdlQuery/singleWsdlQuery.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/singleWsdlQuery/singleWsdlQuery.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/wsdlQuery/wsdlQuery.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/wsdlQuery/wsdlQuery.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/wsdlQuery/wsdlQuery.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/wsdlQuery/wsdlQuery.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/net60/net60.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/net60/net60.csproj index f42e50e51ce..c2d91e178fd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/net60/net60.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/net60/net60.csproj @@ -10,8 +10,5 @@ - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/net60net48/net60net48.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/net60net48/net60net48.csproj index 06a9e4f419f..7322e3fc38e 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/net60net48/net60net48.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/net60net48/net60net48.csproj @@ -4,16 +4,13 @@ Exe net6.0;net48 - + - - - - + System.ServiceModel diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/netstd20/netstd20.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/netstd20/netstd20.csproj index e09e63205b0..c542073cd70 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/netstd20/netstd20.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetCloseAsyncGeneration/netstd20/netstd20.csproj @@ -8,5 +8,6 @@ + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetTypeReuse/TypeReuseClient/TypeReuseClient.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetTypeReuse/TypeReuseClient/TypeReuseClient.csproj index 57fd002c016..f91cc1e9fdd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetTypeReuse/TypeReuseClient/TypeReuseClient.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetTypeReuse/TypeReuseClient/TypeReuseClient.csproj @@ -13,8 +13,5 @@ - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFM/net90/net90.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFM/net90/net90.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFM/net90/net90.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFM/net90/net90.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm100/tfm100.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm100/tfm100.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm100/tfm100.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm100/tfm100.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm20/tfm20.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm20/tfm20.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm20/tfm20.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm20/tfm20.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm45/tfm45.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm45/tfm45.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm45/tfm45.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm45/tfm45.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfmDefault/tfmDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfmDefault/tfmDefault.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfmDefault/tfmDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfmDefault/tfmDefault.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 869f06a7401..da51ef7058d 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,19 @@ Exe N.N + enable + enable $resultPath$/TestResults/TFMBootstrap/tfmDefault/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/tfmDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/tfmDefault.csproj index 1acf18bf1bd..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/tfmDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/tfmDefault.csproj @@ -3,15 +3,18 @@ Exe N.N + enable + enable + + + - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj index db2bb4e528f..1e16b6332fc 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,19 @@ Exe N.N + enable + enable $resultPath$/TestResults/TFMBootstrap/tfmNet60/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/tfmNet60.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/tfmNet60.csproj index 1acf18bf1bd..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/tfmNet60.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/tfmNet60.csproj @@ -3,15 +3,18 @@ Exe N.N + enable + enable + + + - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 9d76a6f8512..7b4644e1b58 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,19 @@ Exe N.N + enable + enable $resultPath$/TestResults/TFMBootstrap/tfmNetstd20/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/tfmNetstd20.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/tfmNetstd20.csproj index 1acf18bf1bd..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/tfmNetstd20.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/tfmNetstd20.csproj @@ -3,15 +3,18 @@ Exe N.N + enable + enable + + + - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 726c406c2de..7f6d3b330bf 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,19 @@ Exe N.N + enable + enable $resultPath$/TestResults/TFMBootstrap/tfmNetstd21/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/tfmNetstd21.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/tfmNetstd21.csproj index 1acf18bf1bd..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/tfmNetstd21.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/tfmNetstd21.csproj @@ -3,15 +3,18 @@ Exe N.N + enable + enable + + + - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 922c4f27102..a806af8fba7 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,19 @@ Exe N.N + enable + enable $USERPROFILE$/.dotnet/tools/.store/dotnet-svcutil/99.99.99/dotnet-svcutil/99.99.99/tools/DOTNET_VERSION/any/dotnet-svcutil-lib.dll + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/tfmGlobalDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/tfmGlobalDefault.csproj index 5a8cf333d18..c2d91e178fd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/tfmGlobalDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/tfmGlobalDefault.csproj @@ -3,12 +3,12 @@ Exe N.N + enable + enable - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 922c4f27102..a806af8fba7 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,19 @@ Exe N.N + enable + enable $USERPROFILE$/.dotnet/tools/.store/dotnet-svcutil/99.99.99/dotnet-svcutil/99.99.99/tools/DOTNET_VERSION/any/dotnet-svcutil-lib.dll + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/tfmGlobalNetstd20.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/tfmGlobalNetstd20.csproj index 5a8cf333d18..c2d91e178fd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/tfmGlobalNetstd20.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/tfmGlobalNetstd20.csproj @@ -3,12 +3,12 @@ Exe N.N + enable + enable - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateNetPipeServiceRef/UpdateNetPipeServiceRefBootstrapping/UpdateNetPipeServiceRefBootstrapping.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateNetPipeServiceRef/UpdateNetPipeServiceRefBootstrapping/UpdateNetPipeServiceRefBootstrapping.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateNetPipeServiceRef/UpdateNetPipeServiceRefBootstrapping/UpdateNetPipeServiceRefBootstrapping.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateNetPipeServiceRef/UpdateNetPipeServiceRefBootstrapping/UpdateNetPipeServiceRefBootstrapping.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateNetPipeServiceRef/UpdateNetPipeServiceRefDefault/UpdateNetPipeServiceRefDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateNetPipeServiceRef/UpdateNetPipeServiceRefDefault/UpdateNetPipeServiceRefDefault.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateNetPipeServiceRef/UpdateNetPipeServiceRefDefault/UpdateNetPipeServiceRefDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateNetPipeServiceRef/UpdateNetPipeServiceRefDefault/UpdateNetPipeServiceRefDefault.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefBootstrapping/UpdateServiceRefBootstrapping.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefBootstrapping/UpdateServiceRefBootstrapping.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefBootstrapping/UpdateServiceRefBootstrapping.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefBootstrapping/UpdateServiceRefBootstrapping.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefDefault/UpdateServiceRefDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefDefault/UpdateServiceRefDefault.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefDefault/UpdateServiceRefDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefDefault/UpdateServiceRefDefault.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevels/UpdateRefLevels.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevels/UpdateRefLevels.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevels/UpdateRefLevels.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevels/UpdateRefLevels.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevelsFull/UpdateRefLevelsFull.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevelsFull/UpdateRefLevelsFull.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevelsFull/UpdateRefLevelsFull.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevelsFull/UpdateRefLevelsFull.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsDefault/UpdateServiceRefOptionsDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsDefault/UpdateServiceRefOptionsDefault.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsDefault/UpdateServiceRefOptionsDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsDefault/UpdateServiceRefOptionsDefault.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptions/UpdateServiceRefOptionsExtraOptions.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptions/UpdateServiceRefOptionsExtraOptions.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptions/UpdateServiceRefOptionsExtraOptions.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptions/UpdateServiceRefOptionsExtraOptions.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptionsWarn/UpdateServiceRefOptionsExtraOptionsWarn.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptionsWarn/UpdateServiceRefOptionsExtraOptionsWarn.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptionsWarn/UpdateServiceRefOptionsExtraOptionsWarn.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptionsWarn/UpdateServiceRefOptionsExtraOptionsWarn.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFilePath/UpdateServiceRefOptionsFilePath.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFilePath/UpdateServiceRefOptionsFilePath.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFilePath/UpdateServiceRefOptionsFilePath.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFilePath/UpdateServiceRefOptionsFilePath.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFullPath/UpdateServiceRefOptionsFullPath.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFullPath/UpdateServiceRefOptionsFullPath.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFullPath/UpdateServiceRefOptionsFullPath.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFullPath/UpdateServiceRefOptionsFullPath.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef/UpdateServiceRefOptionsRef.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef/UpdateServiceRefOptionsRef.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef/UpdateServiceRefOptionsRef.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef/UpdateServiceRefOptionsRef.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef2/UpdateServiceRefOptionsRef2.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef2/UpdateServiceRefOptionsRef2.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef2/UpdateServiceRefOptionsRef2.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef2/UpdateServiceRefOptionsRef2.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces/UpdateServiceRefOptions_Folder_With_Spaces.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces/UpdateServiceRefOptions_Folder_With_Spaces.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces/UpdateServiceRefOptions_Folder_With_Spaces.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces/UpdateServiceRefOptions_Folder_With_Spaces.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces_Full/UpdateServiceRefOptions_Folder_With_Spaces_Full.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces_Full/UpdateServiceRefOptions_Folder_With_Spaces_Full.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces_Full/UpdateServiceRefOptions_Folder_With_Spaces_Full.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces_Full/UpdateServiceRefOptions_Folder_With_Spaces_Full.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReference/CSServiceReference.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReference/CSServiceReference.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReference/CSServiceReference.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReference/CSServiceReference.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReferenceRoundtrip/CSServiceReferenceRoundtrip.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReferenceRoundtrip/CSServiceReferenceRoundtrip.csproj index a969b49c93a..e91e0b717c9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReferenceRoundtrip/CSServiceReferenceRoundtrip.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReferenceRoundtrip/CSServiceReferenceRoundtrip.csproj @@ -8,14 +8,13 @@ - + + + - - - \ No newline at end of file