Skip to content

Commit b12fa3b

Browse files
ViktorHoferViktorHofer
authored
Strong name key id cleanup and pkg testing move (dotnet#57044)
* Move src/libraries/pkg/test to src/libraries/testPackages * Remove default StrongNameKeyId Open properties
1 parent 27059fb commit b12fa3b

File tree

51 files changed

+1
-147
lines changed

Some content is hidden

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

51 files changed

+1
-147
lines changed

‎src/libraries/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props

-6
This file was deleted.

‎src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props

-6
This file was deleted.

‎src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<SupportedOSPlatforms>windows</SupportedOSPlatforms>
65
</PropertyGroup>
76
</Project>

‎src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
44
<AssemblyFileVersion>$(AssemblyVersion)</AssemblyFileVersion>
5-
<StrongNameKeyId>Open</StrongNameKeyId>
65
</PropertyGroup>
76
</Project>

‎src/libraries/System.Buffers/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Data.Odbc/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<IncludePlatformAttributes>true</IncludePlatformAttributes>
65
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
76
</PropertyGroup>

‎src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Diagnostics.EventLog/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<IsAspNetCoreApp>true</IsAspNetCoreApp>
65
<SupportedOSPlatforms>windows</SupportedOSPlatforms>
76
</PropertyGroup>

‎src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<SupportedOSPlatforms>windows</SupportedOSPlatforms>
65
</PropertyGroup>
76
</Project>

‎src/libraries/System.Drawing.Common/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<SupportedOSPlatforms>windows</SupportedOSPlatforms>
65
</PropertyGroup>
76
</Project>

‎src/libraries/System.IO.Hashing/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.IO.Pipelines/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<IsAspNetCoreApp>true</IsAspNetCoreApp>
65
</PropertyGroup>
76
</Project>

‎src/libraries/System.IO.Ports/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<IncludePlatformAttributes>true</IncludePlatformAttributes>
65
<UnsupportedOSPlatforms>browser;android;ios;tvos</UnsupportedOSPlatforms>
76
</PropertyGroup>

‎src/libraries/System.Memory.Data/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Memory/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Net.Http.Json/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Net.HttpListener/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<IncludePlatformAttributes>true</IncludePlatformAttributes>
65
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
76
</PropertyGroup>

‎src/libraries/System.Net.Mail/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<IncludePlatformAttributes>true</IncludePlatformAttributes>
65
</PropertyGroup>
76
</Project>

‎src/libraries/System.Net.ServicePoint/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Net.WebClient/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<IncludePlatformAttributes>true</IncludePlatformAttributes>
65
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
76
</PropertyGroup>

‎src/libraries/System.Net.WebProxy/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Numerics.Tensors/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<!-- This is a preview package. Do not mark as stable. -->
65
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
76
<IsShippingAssembly>false</IsShippingAssembly>

‎src/libraries/System.Private.Xml.Linq/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Private.Xml/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Reflection.MetadataLoadContext/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Resources.Extensions/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Runtime.Intrinsics/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Security.Cryptography.Xml/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<IsAspNetCoreApp>true</IsAspNetCoreApp>
65
<IncludePlatformAttributes>true</IncludePlatformAttributes>
76
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>

‎src/libraries/System.Security.Permissions/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33
<PropertyGroup>
4-
<StrongNameKeyId>Open</StrongNameKeyId>
54
<IncludePlatformAttributes>true</IncludePlatformAttributes>
65
</PropertyGroup>
76
</Project>

‎src/libraries/System.ServiceModel.Syndication/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Text.Encodings.Web/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Threading.Channels/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Transactions.Local/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.ValueTuple/Directory.Build.props

-6
This file was deleted.

‎src/libraries/System.Web.HttpUtility/Directory.Build.props

-6
This file was deleted.

‎src/libraries/pkg/test/build/Directory.Build.props renamed to ‎src/libraries/testPackages/build/Directory.Build.props

File renamed without changes.

‎src/libraries/pkg/test/build/Directory.Build.targets renamed to ‎src/libraries/testPackages/build/Directory.Build.targets

File renamed without changes.

‎src/libraries/pkg/test/build/dirs.proj renamed to ‎src/libraries/testPackages/build/dirs.proj

File renamed without changes.

‎src/libraries/pkg/test/build/packageTest.targets renamed to ‎src/libraries/testPackages/build/packageTest.targets

File renamed without changes.

‎src/libraries/pkg/test/frameworkSettings/netcoreapp/settings.targets renamed to ‎src/libraries/testPackages/frameworkSettings/netcoreapp/settings.targets

File renamed without changes.

‎src/libraries/pkg/test/frameworkSettings/netframework/settings.targets renamed to ‎src/libraries/testPackages/frameworkSettings/netframework/settings.targets

File renamed without changes.

‎src/libraries/pkg/test/frameworkSettings/netstandard/settings.targets renamed to ‎src/libraries/testPackages/frameworkSettings/netstandard/settings.targets

File renamed without changes.

‎src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/netstandard2.1/settings.targets renamed to ‎src/libraries/testPackages/packageSettings/Microsoft.Windows.Compatibility/netstandard2.1/settings.targets

File renamed without changes.

‎src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/workaroundDowngrade.targets renamed to ‎src/libraries/testPackages/packageSettings/Microsoft.Windows.Compatibility/workaroundDowngrade.targets

File renamed without changes.

‎src/libraries/pkg/test/packageSettings/Microsoft.XmlSerializer.Generator/netframework/disableNetstandardTest.targets renamed to ‎src/libraries/testPackages/packageSettings/Microsoft.XmlSerializer.Generator/netframework/disableNetstandardTest.targets

File renamed without changes.

‎src/libraries/pkg/test/packageSettings/System.IO.Ports/workaroundDowngrade.targets renamed to ‎src/libraries/testPackages/packageSettings/System.IO.Ports/workaroundDowngrade.targets

File renamed without changes.

‎src/libraries/pkg/test/packageSettings/System.Runtime.Experimental/settings.targets renamed to ‎src/libraries/testPackages/packageSettings/System.Runtime.Experimental/settings.targets

File renamed without changes.

‎src/libraries/pkg/test/project.csproj.template renamed to ‎src/libraries/testPackages/project.csproj.template

File renamed without changes.

‎src/libraries/pkg/test/testPackages.proj renamed to ‎src/libraries/testPackages/testPackages.proj

File renamed without changes.

‎src/libraries/tests.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@
310310
<ProjectReference Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj"
311311
Exclude="@(ProjectExclusions)"
312312
Condition="'$(TestAssemblies)' == 'true'" />
313-
<ProjectReference Include="$(MSBuildThisFileDirectory)pkg\test\testPackages.proj"
313+
<ProjectReference Include="$(MSBuildThisFileDirectory)testPackages\testPackages.proj"
314314
Condition="'$(TestPackages)' == 'true'" />
315315
<TrimmingTestProjects Include="$(MSBuildThisFileDirectory)*\tests\**\*.TrimmingTests.proj"
316316
Exclude="@(ProjectExclusions)"

0 commit comments

Comments
 (0)