Skip to content

Commit bc00ec2

Browse files
committed
Remove net6.0 support from NetNamedPipe code gen.
1 parent c6353c6 commit bc00ec2

File tree

4 files changed

+3
-12
lines changed

4 files changed

+3
-12
lines changed

src/dotnet-svcutil/lib/Microsoft.Svcutil.NamedPipeMetadataImporter/Microsoft.Svcutil.NamedPipeMetadataImporter.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<AssemblyVersionFile>$(IntermediateOutputPath)\$(TargetFramework)\$(MSBuildProjectName).$(TargetFramework).version.cs</AssemblyVersionFile>
44
</PropertyGroup>
55
<PropertyGroup>
6-
<TargetFrameworks>net6.0;net8.0;$(NetFrameworkVersion)</TargetFrameworks>
6+
<TargetFrameworks>net8.0;$(NetFrameworkVersion)</TargetFrameworks>
77
<RootNamespace>Microsoft.Tools.ServiceModel.Svcutil</RootNamespace>
88
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
99
<LangVersion>latest</LangVersion>

src/dotnet-svcutil/lib/src/Metadata/ServiceDescriptor.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,7 @@ public async Task ImportMetadataAsync(Action<WsdlImporter> onWsdlImporterCreated
100100
//if it's net.pipe url
101101
if (MetadataUrl != null && MetadataUrl.Scheme.Equals("net.pipe"))
102102
{
103-
string tfn;
104-
if (OperationalCtx == OperationalContext.Infrastructure)
105-
{
106-
tfn = "net462";
107-
}
108-
else
109-
{
110-
tfn = Environment.Version.Major >= 8 ? "net8.0" : "net6.0";
111-
}
103+
string tfn = OperationalCtx == OperationalContext.Infrastructure ? "net462" : "net8.0";
112104

113105
string toolPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
114106
Assembly assembly = Assembly.LoadFrom($"{toolPath}/{tfn}/Microsoft.Svcutil.NamedPipeMetadataImporter.dll");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ public bool AddDependency(ProjectDependency dependency, bool copyInternalAssets
551551
if(copyInternalAssets && dependency.AssemblyName == "dotnet-svcutil-lib")
552552
{
553553
string basePath;
554-
string[] frameworks = { "net6.0", "net8.0", "net462" };
554+
string[] frameworks = { "net8.0", "net462" };
555555
switch (dependency.DependencyType)
556556
{
557557
case ProjectDependencyType.Binary:

src/dotnet-svcutil/lib/src/dotnet-svcutil-lib.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
</ItemGroup>
6363
<Target Name="PackAdditonalDlls" AfterTargets="build">
6464
<ItemGroup>
65-
<None Include="$([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)\'))\Microsoft.Svcutil.NamedPipeMetadataImporter\$(Configuration)\net6.0\*.dll" Pack="true" PackagePath="net6.0" />
6665
<None Include="$([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)\'))\Microsoft.Svcutil.NamedPipeMetadataImporter\$(Configuration)\net8.0\*.dll" Pack="true" PackagePath="net8.0" />
6766
<None Include="$([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)\'))\Microsoft.Svcutil.NamedPipeMetadataImporter\$(Configuration)\net462\*.dll" Pack="true" PackagePath="net462" />
6867
</ItemGroup>

0 commit comments

Comments
 (0)