Skip to content

Commit 2c4340b

Browse files
elinor-fungelinor-fung
committed
Rename build properties
1 parent e34dda1 commit 2c4340b

File tree

45 files changed

+76
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+76
-76
lines changed

‎eng/generators.targets

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project>
22

33
<PropertyGroup>
4-
<EnableDllImportGenerator Condition="'$(EnableDllImportGenerator)' == ''
5-
and '$(MSBuildProjectName)' == 'System.Private.CoreLib'">true</EnableDllImportGenerator>
6-
<IncludeDllImportGeneratorSources Condition="'$(IncludeDllImportGeneratorSources)' == ''">true</IncludeDllImportGeneratorSources>
4+
<EnableLibraryImportGenerator Condition="'$(EnableLibraryImportGenerator)' == ''
5+
and '$(MSBuildProjectName)' == 'System.Private.CoreLib'">true</EnableLibraryImportGenerator>
6+
<IncludeLibraryImportGeneratorSources Condition="'$(IncludeLibraryImportGeneratorSources)' == ''">true</IncludeLibraryImportGeneratorSources>
77
</PropertyGroup>
88
<ItemGroup>
9-
<EnabledGenerators Include="DllImportGenerator" Condition="'$(EnableDllImportGenerator)' == 'true'" />
10-
<!-- If the current project is not System.Private.CoreLib, we enable the DllImportGenerator source generator
9+
<EnabledGenerators Include="LibraryImportGenerator" Condition="'$(EnableLibraryImportGenerator)' == 'true'" />
10+
<!-- If the current project is not System.Private.CoreLib, we enable the LibraryImportGenerator source generator
1111
when the project is a C# source project that either:
1212
- references System.Private.CoreLib, or
1313
- references System.Runtime.InteropServices -->
14-
<EnabledGenerators Include="DllImportGenerator"
15-
Condition="'$(EnableDllImportGenerator)' == ''
14+
<EnabledGenerators Include="LibraryImportGenerator"
15+
Condition="'$(EnableLibraryImportGenerator)' == ''
1616
and '$(IsSourceProject)' == 'true'
1717
and '$(MSBuildProjectExtension)' == '.csproj'
1818
and (
@@ -22,16 +22,16 @@
2222
and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)')))
2323
or ('$(NetCoreAppCurrentTargetFrameworkMoniker)' == '$(TargetFrameworkMoniker)'
2424
and '$(DisableImplicitAssemblyReferences)' == 'false'))" />
25-
<EnabledGenerators Include="DllImportGenerator"
26-
Condition="'$(EnableDllImportGenerator)' == ''
25+
<EnabledGenerators Include="LibraryImportGenerator"
26+
Condition="'$(EnableLibraryImportGenerator)' == ''
2727
and '$(IsSourceProject)' == 'true'
2828
and '$(MSBuildProjectExtension)' == '.csproj'
2929
and ('$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == '.NETFramework' or ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '$(NetCoreAppCurrentVersion)'))))" />
3030
</ItemGroup>
3131

3232
<!-- Use this complex ItemGroup-based filtering to add the ProjectReference to make sure dotnet/runtime stays compatible with NuGet Static Graph Restore. -->
3333
<ItemGroup Condition="'@(EnabledGenerators)' != ''
34-
and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'DllImportGenerator'))">
34+
and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'LibraryImportGenerator'))">
3535
<ProjectReference
3636
Include="$(LibrariesProjectRoot)System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj"
3737
OutputItemType="Analyzer"
@@ -42,8 +42,8 @@
4242
ReferenceOutputAssembly="false" />
4343
</ItemGroup>
4444
<ItemGroup Condition="'@(EnabledGenerators)' != ''
45-
and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'DllImportGenerator'))
46-
and '$(IncludeDllImportGeneratorSources)' == 'true'">
45+
and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'LibraryImportGenerator'))
46+
and '$(IncludeLibraryImportGeneratorSources)' == 'true'">
4747
<Compile Include="$(LibrariesProjectRoot)Common\src\System\Runtime\InteropServices\GeneratedDllImportAttribute.cs" />
4848
<Compile Include="$(LibrariesProjectRoot)Common\src\System\Runtime\InteropServices\StringMarshalling.cs" />
4949

@@ -54,7 +54,7 @@
5454
<Compile Condition="'$(NetCoreAppCurrentTargetFrameworkMoniker)' == '$(TargetFrameworkMoniker)'
5555
and (
5656
'$(MSBuildProjectName)' == 'System.Private.CoreLib'
57-
or '$(EnableDllImportGenerator)' == 'true'
57+
or '$(EnableLibraryImportGenerator)' == 'true'
5858
or ('@(Reference)' != ''
5959
and @(Reference->AnyHaveMetadataValue('Identity', 'System.Memory')))
6060
or ('@(ProjectReference)' != ''
@@ -75,16 +75,16 @@
7575
</ItemGroup>
7676

7777
<Target Name="ConfigureGenerators"
78-
DependsOnTargets="ConfigureDllImportGenerator"
78+
DependsOnTargets="ConfigureLibraryImportGenerator"
7979
BeforeTargets="CoreCompile" />
8080

81-
<!-- Microsoft.Interop.DllImportGenerator -->
82-
<Target Name="ConfigureDllImportGenerator"
83-
Condition="'@(EnabledGenerators)' != '' and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'DllImportGenerator'))"
81+
<!-- Microsoft.Interop.LibraryImportGenerator -->
82+
<Target Name="ConfigureLibraryImportGenerator"
83+
Condition="'@(EnabledGenerators)' != '' and @(EnabledGenerators->AnyHaveMetadataValue('Identity', 'LibraryImportGenerator'))"
8484
DependsOnTargets="ResolveProjectReferences"
8585
BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun">
8686
<PropertyGroup>
87-
<DllImportGenerator_UseMarshalType>true</DllImportGenerator_UseMarshalType>
87+
<LibraryImportGenerator_UseMarshalType>true</LibraryImportGenerator_UseMarshalType>
8888
</PropertyGroup>
8989
</Target>
9090

‎src/coreclr/nativeaot/Test.CoreLib/src/Test.CoreLib.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
44
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
55
<TargetFramework>netstandard2.0</TargetFramework>
6-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
6+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
77
<!--
88
SYSLIB1053: LibraryImportGenerator Target Framework Not Supported.
99
-->

‎src/libraries/Common/src/System/Runtime/InteropServices/ArrayMarshaller.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace System.Runtime.InteropServices.GeneratedMarshalling
1414
{
15-
#if DLLIMPORT_GENERATOR_TEST
15+
#if LIBRARYIMPORT_GENERATOR_TEST
1616
public
1717
#else
1818
internal
@@ -106,7 +106,7 @@ public void FreeNative()
106106
}
107107
}
108108

109-
#if DLLIMPORT_GENERATOR_TEST
109+
#if LIBRARYIMPORT_GENERATOR_TEST
110110
public
111111
#else
112112
internal

‎src/libraries/Common/src/System/Runtime/InteropServices/GeneratedDllImportAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace System.Runtime.InteropServices
1212
/// Indicates that method will be generated at compile time and invoke into an unmanaged library entry point
1313
/// </summary>
1414
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
15-
#if DLLIMPORT_GENERATOR_TEST
15+
#if LIBRARYIMPORT_GENERATOR_TEST
1616
public
1717
#else
1818
internal

‎src/libraries/Common/src/System/Runtime/InteropServices/GeneratedMarshallingAttribute.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace System.Runtime.InteropServices
1010
{
1111
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
12-
#if DLLIMPORT_GENERATOR_TEST
12+
#if LIBRARYIMPORT_GENERATOR_TEST
1313
public
1414
#else
1515
internal
@@ -19,7 +19,7 @@ sealed class GeneratedMarshallingAttribute : Attribute
1919
}
2020

2121
[AttributeUsage(AttributeTargets.Struct | AttributeTargets.Class)]
22-
#if DLLIMPORT_GENERATOR_TEST
22+
#if LIBRARYIMPORT_GENERATOR_TEST
2323
public
2424
#else
2525
internal
@@ -35,7 +35,7 @@ public NativeMarshallingAttribute(Type nativeType)
3535
}
3636

3737
[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.ReturnValue | AttributeTargets.Field, AllowMultiple = true)]
38-
#if DLLIMPORT_GENERATOR_TEST
38+
#if LIBRARYIMPORT_GENERATOR_TEST
3939
public
4040
#else
4141
internal
@@ -65,7 +65,7 @@ public MarshalUsingAttribute(Type nativeType)
6565
}
6666

6767
[AttributeUsage(AttributeTargets.Struct | AttributeTargets.Class)]
68-
#if DLLIMPORT_GENERATOR_TEST
68+
#if LIBRARYIMPORT_GENERATOR_TEST
6969
public
7070
#else
7171
internal

‎src/libraries/Common/src/System/Runtime/InteropServices/StringMarshalling.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace System.Runtime.InteropServices
99
/// <summary>
1010
/// Specifies how strings should be marshalled for generated p/invokes
1111
/// </summary>
12-
#if DLLIMPORT_GENERATOR_TEST
12+
#if LIBRARYIMPORT_GENERATOR_TEST
1313
public
1414
#else
1515
internal

‎src/libraries/Common/tests/Common.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
55
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
66
<Nullable>annotations</Nullable>
7-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
7+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
88
</PropertyGroup>
99
<ItemGroup>
1010
<Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs"

‎src/libraries/Common/tests/TestUtilities/TestUtilities.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
and instead use runtime checks.
99
-->
1010
<TargetFrameworks>$(NetCoreAppMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
11-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
11+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<EmbeddedResource Include="$(MSBuildThisFileDirectory)ILLink.Substitutions.AggressiveTrimming.xml"

‎src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<IsPackable>true</IsPackable>
99
<PackageDescription>.NET hosting infrastructure for Windows Services.</PackageDescription>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
11-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
11+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

‎src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<!-- Use targeting pack references instead of granular ones in the project file. -->
1010
<DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
1111
<IncludePlatformAttributes>true</IncludePlatformAttributes>
12-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
12+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
1313
<IsPackable>true</IsPackable>
1414
<PackageDescription>Console logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
1515
</PropertyGroup>
@@ -42,7 +42,7 @@
4242
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
4343
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\StringSyntaxAttribute.cs" />
4444
</ItemGroup>
45-
45+
4646
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
4747
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj" />
4848
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />

‎src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants>
44
<TargetFrameworks>$(NetCoreAppCurrent)-windows</TargetFrameworks>
5-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
5+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
</PropertyGroup>
88
<ItemGroup>

‎src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
44
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
6+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
77
</PropertyGroup>
88
<ItemGroup>
99
<Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs"

‎src/libraries/System.Console/tests/System.Console.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
44
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
55
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows</TargetFrameworks>
6-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
6+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
77
</PropertyGroup>
88
<ItemGroup>
99
<Compile Include="CancelKeyPress.cs" />

‎src/libraries/System.Diagnostics.EventLog/src/Messages/System.Diagnostics.EventLog.Messages.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<Win32Resource>EventLogMessages.res</Win32Resource>
55
<!-- Override the parent Directory.Build.props -->
66
<SupportedOSPlatforms />
7-
<EnableDllImportGenerator>false</EnableDllImportGenerator>
7+
<EnableLibraryImportGenerator>false</EnableLibraryImportGenerator>
88
</PropertyGroup>
99
</Project>

‎src/libraries/System.Diagnostics.EventLog/tests/System.Diagnostics.EventLog.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetFrameworkMinimum)</TargetFrameworks>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
5+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
66
</PropertyGroup>
77
<ItemGroup>
88
<Compile Include="EventInstanceTests.cs" />

‎src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
6-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
6+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
77
</PropertyGroup>
88
<ItemGroup>
99
<!-- Checked in test binaries for FileVersionInfoTest -->

‎src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
55
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
66
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
7-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
7+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
88
</PropertyGroup>
99
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
1010
<PropertyGroup>

‎src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
3+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
66
</PropertyGroup>

‎src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
55
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-FreeBSD</TargetFrameworks>
66
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'tvOS'">true</IgnoreForCI>
7-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
7+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
88
</PropertyGroup>
99
<ItemGroup>
1010
<Compile Include="AssemblyInfo.cs" />

‎src/libraries/System.IO.FileSystem/tests/DisabledFileLockingTests/System.IO.FileSystem.DisabledFileLocking.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
44
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
5-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
5+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
66
<!-- file locking can't be disabled on Windows -->
77
<TargetFrameworks>$(NetCoreAppCurrent)-Unix</TargetFrameworks>
88

‎src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
66

77
<WasmXHarnessMonoArgs>--working-dir=/test-dir</WasmXHarnessMonoArgs>
8-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
8+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
99
</PropertyGroup>
1010
<ItemGroup>
1111
<Compile Include="Base\BaseGetSetAttributes.cs" />

‎src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
44
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
55
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
6-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
6+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
77
</PropertyGroup>
88
<ItemGroup>
99
<Compile Include="MemoryMappedFile.CreateFromFile.Tests.cs" />

‎src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
55
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)</TargetFrameworks>
66
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
7-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
7+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
88
</PropertyGroup>
99
<ItemGroup>
1010
<Compile Include="AssemblyInfo.cs" />

‎src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
66
<TargetFrameworks>$(NetCoreAppCurrent)-windows</TargetFrameworks>
77
<DefineConstants>UNITTEST</DefineConstants>
8-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
8+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
99
<Nullable>annotations</Nullable>
1010
</PropertyGroup>
1111
<ItemGroup>

‎src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
77
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Linux;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
8-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
8+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
99
</PropertyGroup>
1010

1111
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->

‎src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
66
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-MacCatalyst;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
77
<Nullable>annotations</Nullable>
8-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
8+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
99
</PropertyGroup>
1010
<!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
1111
<ItemGroup>

‎src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
55
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
66
<Nullable>annotations</Nullable>
7-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
7+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
88
</PropertyGroup>
99
<ItemGroup>
1010
<Compile Include="Base64EncodingTest.cs" />

‎src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
66
<Nullable>annotations</Nullable>
77
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
8-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
8+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
99
</PropertyGroup>
1010
<!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
1111
<ItemGroup>

‎src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
66
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
7-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
7+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
88
</PropertyGroup>
99
<!-- Test APIs introduced after 1.0 -->
1010
<ItemGroup>

‎src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
44
<StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
55
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
6-
<EnableDllImportGenerator>true</EnableDllImportGenerator>
6+
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
77
</PropertyGroup>
88
<PropertyGroup>
99
<!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the

0 commit comments

Comments
 (0)