Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix System.Web.Services.Description missing NetFx type forwards #5708

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Fix System.Web.Services.Description missing NetFx type forwards #5708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions System.ServiceModel.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Shim",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.NetFramingBase.Ref", "src\System.ServiceModel.NetFramingBase\ref\System.ServiceModel.NetFramingBase.Ref.csproj", "{09D0456B-C1C6-40E4-AE8E-64D60189A7B2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Services.Description.Ref", "src\System.Web.Services.Description\ref\System.Web.Services.Description.Ref.csproj", "{0CF0FD4F-387F-4AF1-8509-80053EBA94CC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -307,6 +309,10 @@ Global
{09D0456B-C1C6-40E4-AE8E-64D60189A7B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{09D0456B-C1C6-40E4-AE8E-64D60189A7B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{09D0456B-C1C6-40E4-AE8E-64D60189A7B2}.Release|Any CPU.Build.0 = Release|Any CPU
{0CF0FD4F-387F-4AF1-8509-80053EBA94CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0CF0FD4F-387F-4AF1-8509-80053EBA94CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CF0FD4F-387F-4AF1-8509-80053EBA94CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0CF0FD4F-387F-4AF1-8509-80053EBA94CC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion eng/GenRefAssembly.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</PropertyGroup>

<Target Name="AddReferenceAssemblyToPackage" AfterTargets="AssignTargetPaths">
<ItemGroup>
<ItemGroup Condition="'$(SuppressRefAssemblyTargetFrameworks)' == '' OR !$(SuppressRefAssemblyTargetFrameworks.Contains('$(TargetFramework)'))">
<TfmSpecificPackageFile Include="@(ResolvedReferenceAssemblyReference)" PackagePath="ref/$(TargetFramework)" />
</ItemGroup>
</Target>
Expand Down
14 changes: 10 additions & 4 deletions src/System.Private.ServiceModel/tools/PackageChecker/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ internal class Program
{
/// <summary>
/// This app validates a NuGet package is formed correctly. Currently it only validates that all types in the
/// netstandard2.0 reference assembly are type forwarded for .NET Framework
/// netstandard2.0 reference assembly are type forwarded for .NET Framework.
/// </summary>
/// <param name="package">The NuGet package to validate</param>
/// <param name="verbose">Turns on verbose output</param>
Expand Down Expand Up @@ -34,15 +34,21 @@ private static int Main(FileInfo package, bool verbose)
var netFxLibEntries = zipArchive.Entries.Where(e => e.FullName.StartsWith("lib/net4"));
if (!netFxLibEntries.Any())
{
Console.Error.WriteLine("Expected assemblies in a lib/net4?? folder, none found");
Console.Error.WriteLine("No assemblies found in a lib/net4?? folder. No type forwards to check.");
Console.Error.WriteLine("If netfx isn't intended to be supported, this is expected.");
return 1;
}

var netstandardRefEntries = zipArchive.Entries.Where(e => e.FullName.StartsWith("ref/netstandard2.0/"));
if (!netstandardRefEntries.Any())
{
Console.Error.WriteLine("Expected assemblies in the ref/netstandard2.0 folder, none found");
return 1;
Console.Error.WriteLine("No assemblies in the ref/netstandard2.0 folder, checking lib/netstandard2.0");
netstandardRefEntries = zipArchive.Entries.Where(e => e.FullName.StartsWith("lib/netstandard2.0/"));
if (!netstandardRefEntries.Any())
{
Console.Error.WriteLine("No assemblies in the lib/netstandard2.0 folder");
return 1;
}
}

var runtimeFolder = @"C:\Windows\Microsoft.NET\Framework64\v4.0.30319\";
Expand Down
13 changes: 13 additions & 0 deletions src/System.Web.Services.Description/ref/System.Web.Services.Description.Ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyVersion>$(WcfAssemblyVersion)</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<AssemblyName>System.Web.Services.Description</AssemblyName>
<RootNamespace>System.ServiceModel</RootNamespace>
<CLSCompliant>true</CLSCompliant>
<IsShipping>$(Ship_WcfPackages)</IsShipping>
<IsShippingPackage>false</IsShippingPackage>
</PropertyGroup>

</Project>
Loading
Loading