Remove Traversal project in favor of the solution file (#157)

* Remove Traversal project in favor of the solution file * Classify test utility projects and add UnsetIsPackableForNonSourceProjects switch * Update unsetispackable.targets
dotnet · Nov 8, 2024 · fba2ed2 · fba2ed2
1 parent 5a038ad
commit fba2ed2
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 37 deletions.
diff --git a/Build.proj b/Build.proj
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -21,9 +21,6 @@
     <BeforeTargetFrameworkInferenceTargets>$(RepositoryEngineeringDir)BeforeTargetFrameworkInference.targets</BeforeTargetFrameworkInferenceTargets>
     <!-- Only upgrade NuGetAudit warnings to errors for official builds. -->
     <WarningsNotAsErrors Condition="'$(OfficialBuild)' != 'true'">$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
-    <IsSourceProject Condition="'$(IsSourceProject)' == '' and
-                                '$(IsTestProject)' != 'true' and
-                                '$(UsingMicrosoftTraversalSdk)' != 'true'">true</IsSourceProject>
     <!-- Prevent generating docs xmls from triple slash by default. Use the commited xml files instead.
          Individual projects that want to generate docs from triple slash can set this to true. -->
     <GenerateDocumentationFile>false</GenerateDocumentationFile>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,7 +1,15 @@
 <Project>
 
+  <PropertyGroup>
+    <IsSourceProject Condition="'$(IsSourceProject)' == '' and
+                                '$(IsTestProject)' != 'true' and
+                                '$(IsTestUtilityProject)' != 'true'">true</IsSourceProject>
+  </PropertyGroup>
+
+  <Import Project="$(RepositoryEngineeringDir)unsetispackable.targets" Condition="'$(UnsetIsPackableForNonSourceProjects)' == 'true' and '$(IsSourceProject)' != 'true'" />
   <Import Project="$(RepositoryEngineeringDir)resources.targets" />
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
   <Import Project="$(RepositoryEngineeringDir)testing\runsettings.targets" Condition="'$(IsTestProject)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)placeholderpackaging.targets" Condition="'$(IsPlaceholderTargetFramework)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)packaging.targets" Condition="'$(IsPackable)' == 'true'" />

diff --git a/eng/Build.props b/eng/Build.props
diff --git a/eng/pipelines/maintenance-packages-pr.yml b/eng/pipelines/maintenance-packages-pr.yml
@@ -117,8 +117,9 @@ stages:
         - script: eng/common/cibuild.sh
             --configuration $(_BuildConfig)
             --prepareMachine
-            /p:SkipTests=true
+            /p:Test=false
             /p:IsPackable=true
+            /p:UnsetIsPackableForNonSourceProjects=true
             $(_AdditionalBuildArgs)
             $(_InternalBuildArgs)
           displayName: 'Build and pack'

diff --git a/eng/pipelines/maintenance-packages.yml b/eng/pipelines/maintenance-packages.yml
@@ -86,7 +86,7 @@ extends:
             - script: eng\common\cibuild.cmd
                 -configuration Release
                 -prepareMachine
-                /p:SkipTests=true
+                /p:Test=false
                 $(_AdditionalBuildArgs)
                 $(_InternalBuildArgs)
               displayName: $(_BuildJobDisplayName)

diff --git a/eng/unsetispackable.targets b/eng/unsetispackable.targets
@@ -0,0 +1,8 @@
+<Project TreatAsLocalProperty="IsPackable">
+
+  <!-- Unset global IsPackable property. -->
+  <PropertyGroup>
+    <IsPackable />
+  </PropertyGroup>
+
+</Project>
diff --git a/global.json b/global.json
@@ -14,7 +14,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24525.2",
-    "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.NET.Sdk.IL": "8.0.0"
   }
 }
diff --git a/src/System.Data.SqlClient/tests/Directory.Build.props b/src/System.Data.SqlClient/tests/Directory.Build.props
diff --git a/src/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj b/src/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(NetMinimum)-unix;$(NetMinimum)-windows</TargetFrameworks>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj b/src/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(NetMinimum)-unix;$(NetMinimum)-windows</TargetFrameworks>
-    <NoWarn>$(NoWarn);CA2208;</NoWarn>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
+    <NoWarn>$(NoWarn);CA2208</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj b/src/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(NetMinimum)-unix;$(NetMinimum)-windows</TargetFrameworks>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj b/src/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(NetMinimum)-unix;$(NetMinimum)-windows</TargetFrameworks>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.csproj b/src/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(NetMinimum)-windows;$(NetMinimum)-unix;$(NetCurrent)-windows;$(NetCurrent)-unix;</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup>
+    <TargetFrameworks>$(NetMinimum)-windows;$(NetMinimum)-unix;$(NetCurrent)-windows;$(NetCurrent)-unix</TargetFrameworks>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <NoWarn>$(NoWarn);CA1001;CA1051;CA1068;CA1069;CA1304;CA1309;CA1310;CA1311;CA1419;CA1507;CA1510;CA1512;CA1513;CA1711;CA1716;CA1805;CA1806;CA1816;CA1822;CA1830;CA1834;CA1835;CA1836;CA1840;CA1844;CA1852;CA1859;CA1861;CA1862;CA1863;CA1866;CA2016;CA2101;CA2200;CA2201;CA2208;CA2211;CA2219;CA2241;CA2249;CA2251;CA5366;CS0168;CS0618;CS0649;IDE0073;SYSLIB0004;SYSLIB0023;nullable</NoWarn>
   </PropertyGroup>

diff --git a/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj b/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
@@ -7,6 +7,7 @@
     <ClsCompliant>false</ClsCompliant>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <NoWarn>$(NoWarn);CA1001;CA1051;CA1068;CA1069;CA1309;CA1310;CA1419;CA1507;CA1711;CA1716;CA1805;CA1806;CA1816;CA1822;CA1830;CA1834;CA1835;CA1836;CA1840;CA1844;CA2016;CA2101;CA2200;CA2201;CA2208;CA2211;CA2219;CA2249;CA2251;CA5359;CA5366;CS0168;CS0649;IDE0073;SYSLIB0004;SYSLIB0023;nullable</NoWarn>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TDS.Servers.csproj b/src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TDS.Servers.csproj
@@ -7,6 +7,7 @@
     <ClsCompliant>false</ClsCompliant>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <NoWarn>$(NoWarn);CA1001;CA1068;CA1069;CA1304;CA1309;CA1310;CA1419;CA1507;CA1711;CA1716;CA1805;CA1806;CA1816;CA1822;CA1830;CA1834;CA1835;CA1836;CA1840;CA1844;CA1847;CA2016;CA2101;CA2200;CA2201;CA2208;CA2211;CA2219;CA2249;CA2251;CA5366;CS0168;CS0649;IDE0073;SYSLIB0004;SYSLIB0023;nullable</NoWarn>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/System.Data.SqlClient/tests/Tools/TDS/TDS/TDS.csproj b/src/System.Data.SqlClient/tests/Tools/TDS/TDS/TDS.csproj
@@ -6,6 +6,7 @@
     <AssemblyName>Microsoft.SqlServer.TDS</AssemblyName>
     <ClsCompliant>false</ClsCompliant>
     <NoWarn>$(NoWarn);CA1001;CA1068;CA1069;CA1309;CA1310;CA1419;CA1507;CA1711;CA1716;CA1805;CA1806;CA1816;CA1822;CA1830;CA1834;CA1835;CA1836;CA1840;CA1844;CA2016;CA2101;CA2200;CA2201;CA2208;CA2211;CA2219;CA2249;CA2251;CA5366;CS0168;CS0649;IDE0073;SYSLIB0004;SYSLIB0023;nullable</NoWarn>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
   </PropertyGroup>
 
 </Project>