Merge branch 'main' into size-tests

Author: SimonCropp

src/ApiBuilderTests/ApiBuilderTests.csproj

@@ -8,8 +8,6 @@
     <PackageReference Include="NUnit3TestAdapter" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
-    <Compile Include="..\Tests\SolutionDirectoryFinder.cs">
-      <Link>SolutionDirectoryFinder.cs</Link>
-    </Compile>
+    <PackageReference Include="ProjectFiles" />
   </ItemGroup>
 </Project>

src/ApiBuilderTests/BuildApiTest.cs

@@ -1,19 +1,14 @@
+using ProjectFilesGenerator;
+
 [TestFixture]
 public class BuildApiTest
 {
-    static string solutionDirectory;
-    static string polyfillDir;
-
-    static BuildApiTest()
-    {
-        solutionDirectory = SolutionDirectoryFinder.Find();
-        polyfillDir = Path.Combine(solutionDirectory, "Polyfill");
-    }
+    static string polyfillDir = Path.Combine(ProjectFiles.SolutionDirectory, "Polyfill");
 
     [Test]
     public void RunWithRoslyn()
     {
-        var md = Path.Combine(solutionDirectory, "..", "api_list.include.md");
+        var md = Path.Combine(ProjectFiles.SolutionDirectory, "..", "api_list.include.md");
         File.Delete(md);
         using var writer = File.CreateText(md);
         var count = 0;
@@ -31,7 +26,7 @@ public void RunWithRoslyn()
         //Nullability*
         count += 3;
 
-        var countMd = Path.Combine(solutionDirectory, "..", "apiCount.include.md");
+        var countMd = Path.Combine(ProjectFiles.SolutionDirectory, "..", "apiCount.include.md");
         File.Delete(countMd);
         File.WriteAllText(countMd, $"**API count: {count}**");
     }

src/Directory.Packages.props

@@ -12,6 +12,7 @@
     <PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" Pinned="true" />
     <PackageVersion Include="ProjectDefaults" Version="1.0.163" />
     <PackageVersion Include="Microsoft.Bcl.Memory" Version="10.0.1" />
+    <PackageVersion Include="ProjectFiles" Version="0.2.0" />
     <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />

src/Tests/SanityChecks.cs

@@ -1,4 +1,6 @@
-#pragma warning disable IL2026
+using ProjectFilesGenerator;
+
+#pragma warning disable IL2026
 
 [TestFixture]
 public class SanityChecks
@@ -21,7 +23,7 @@ public void NoPublicTypes()
     [Test]
     public void CodeChecks()
     {
-        var dir = Path.Combine(SolutionDirectoryFinder.Find(), "Polyfill");
+        var dir = Path.Combine(ProjectFiles.SolutionDirectory, "Polyfill");
         var errors = new List<string>();
         foreach (var file in Directory.EnumerateFiles(dir, "*.cs", SearchOption.AllDirectories))
         {

src/Tests/SolutionDirectoryFinder.cs

@@ -10,6 +10,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="MarkdownSnippets.MsBuild" PrivateAssets="all" />
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
+    <PackageReference Include="ProjectFiles" />
     <PackageReference Include="System.Memory" Condition="$(TargetFrameworkIdentifier) == '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp'))" />
     <PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
     <PackageReference Include="System.Net.Http" Condition="$(TargetFramework.StartsWith('net4'))" />