add slnx support

sensslen · Dec 27, 2024 · e8f0f30 · e8f0f30
1 parent d4c59df
commit e8f0f30
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 17 deletions.
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -99,7 +99,7 @@ jobs:
       - name: build
         run: msbuild -t:rebuild -property:Configuration=TestWindows
 
-      - name: test
+      - name: test (${{ matrix.framework }})
         uses: josepho0918/vstest-action@main
         with:
           testAssembly: "NuGetUtility.Test.dll"

diff --git a/src/NuGetUtility/NuGetUtility.csproj b/src/NuGetUtility/NuGetUtility.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" Version="17.12.*" />
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" Version="17.11.*" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
@@ -48,7 +48,7 @@
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
     <PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
     <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" Version="17.12.*" />
-    <PackageReference Include="PolySharp" Version="1.14.*">
+    <PackageReference Include="PolySharp" Version="1.15.*">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/NuGetUtility/ReferencedPackagesReader/ProjectsCollector.cs b/src/NuGetUtility/ReferencedPackagesReader/ProjectsCollector.cs
@@ -15,7 +15,7 @@ public ProjectsCollector(IMsBuildAbstraction msBuild)
 
         public IEnumerable<string> GetProjects(string inputPath)
         {
-            return Path.GetExtension(inputPath).Equals(".sln")
+            return Path.GetExtension(inputPath).StartsWith(".sln")
                 ? _msBuild.GetProjectsFromSolution(Path.GetFullPath(inputPath)).Where(File.Exists).Select(Path.GetFullPath)
                 : new[] { Path.GetFullPath(inputPath) };
         }

diff --git a/tests/NuGetUtility.Test/NuGetUtility.Test.csproj b/tests/NuGetUtility.Test/NuGetUtility.Test.csproj
@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
-    <PackageReference Include="PolySharp" Version="1.14.*">
+    <PackageReference Include="PolySharp" Version="1.15.*">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...etProjectsFromSolution_Should_ReturnProjectsInActualSolutionFileAbsolutePath.verified.txt b/...etProjectsFromSolution_Should_ReturnProjectsInActualSolutionFileAbsolutePath.verified.txt
@@ -0,0 +1 @@
+{SolutionDirectory}tests\targets\PackageReferenceProject\PackageReferenceProject.csproj,{SolutionDirectory}tests\targets\PackagesConfigProject\PackagesConfigProject.csproj,{SolutionDirectory}tests\targets\ProjectWithoutNugetReferences\ProjectWithoutNugetReferences.csproj,{SolutionDirectory}tests\targets\ProjectWithTransitiveNuget\ProjectWithTransitiveNuget.csproj,{SolutionDirectory}tests\targets\ProjectWithTransitiveReferences\ProjectWithTransitiveReferences.csproj
diff --git a/tests/NuGetUtility.Test/ReferencedPackagesReader/ProjectsCollectorTest.cs b/tests/NuGetUtility.Test/ReferencedPackagesReader/ProjectsCollectorTest.cs
@@ -38,6 +38,7 @@ public void GetProjects_Should_ReturnProjectsAsListDirectly(string projectFile)
         [TestCase("A.sln")]
         [TestCase("B.sln")]
         [TestCase("C.sln")]
+        [TestCase("A.slnx")]
         public void GetProjects_Should_QueryMsBuildToGetProjectsForSolutionFiles(string solutionFile)
         {
             _ = _uut.GetProjects(solutionFile);
@@ -48,6 +49,7 @@ public void GetProjects_Should_QueryMsBuildToGetProjectsForSolutionFiles(string
         [TestCase("A.sln")]
         [TestCase("B.sln")]
         [TestCase("C.sln")]
+        [TestCase("C.slnx")]
         public void GetProjects_Should_ReturnEmptyArray_If_SolutionContainsNoProjects(string solutionFile)
         {
             _msBuild.GetProjectsFromSolution(Arg.Any<string>()).Returns(Enumerable.Empty<string>());
@@ -61,6 +63,7 @@ public void GetProjects_Should_ReturnEmptyArray_If_SolutionContainsNoProjects(st
         [TestCase("A.sln")]
         [TestCase("B.sln")]
         [TestCase("C.sln")]
+        [TestCase("B.slnx")]
         public void GetProjects_Should_ReturnEmptyArray_If_SolutionContainsProjectsThatDontExist(string solutionFile)
         {
             IEnumerable<string> projects = _fixture.CreateMany<string>();
@@ -75,6 +78,7 @@ public void GetProjects_Should_ReturnEmptyArray_If_SolutionContainsProjectsThatD
         [TestCase("A.sln")]
         [TestCase("B.sln")]
         [TestCase("C.sln")]
+        [TestCase("C.slnx")]
         public void GetProjects_Should_ReturnArrayOfProjects_If_SolutionContainsProjectsThatDoExist(string solutionFile)
         {
             string[] projects = _fixture.CreateMany<string>().ToArray();
@@ -90,6 +94,7 @@ public void GetProjects_Should_ReturnArrayOfProjects_If_SolutionContainsProjects
         [TestCase("A.sln")]
         [TestCase("B.sln")]
         [TestCase("C.sln")]
+        [TestCase("A.slnx")]
         public void GetProjects_Should_ReturnOnlyExistingProjectsInSolutionFile(string solutionFile)
         {
             string[] existingProjects = _fixture.CreateMany<string>().ToArray();
@@ -114,15 +119,23 @@ public void GetProjectsFromSolution_Should_ReturnProjectsInActualSolutionFileRel
             Assert.That(result.Count(), Is.EqualTo(5));
         }
 
+        [Test, Ignore("Ignore this specific test as long as msbuild does not fully support slnx solutions everywhere")]
+        public async Task GetProjectsFromXmlSolution_Should_ReturnProjectsInActualSolutionFileRelativePath()
+        {
+            var msbuild = new MsBuildAbstraction();
+            IEnumerable<string> result = msbuild.GetProjectsFromSolution("../../../../targets/slnx/slnx.slnx");
+            await Verify(string.Join(",", result));
+        }
+
         [Test]
-        public void GetProjectsFromSolution_Should_ReturnProjectsInActualSolutionFileAbsolutePath()
+        public async Task GetProjectsFromSolution_Should_ReturnProjectsInActualSolutionFileAbsolutePath()
         {
             var msbuild = new MsBuildAbstraction();
             IEnumerable<string> result = msbuild.GetProjectsFromSolution(Path.GetFullPath("../../../../targets/Projects.sln"));
-            Assert.That(result.Count(), Is.EqualTo(5));
+            await Verify(string.Join(",", result));
         }
 
-        private void CreateFiles(IEnumerable<string> files)
+        private static void CreateFiles(IEnumerable<string> files)
         {
             foreach (string file in files)
             {

diff --git a/tests/NuGetUtility.Test/ReferencedPackagesReader/ReferencedPackagesReaderIntegrationTest.cs b/tests/NuGetUtility.Test/ReferencedPackagesReader/ReferencedPackagesReaderIntegrationTest.cs
@@ -80,7 +80,7 @@ public void GetInstalledPackagesShould_ReturnResolvedDependency_For_ProjectWithR
 
             IEnumerable<PackageIdentity> result = _uut!.GetInstalledPackages(path, includeTransitive);
 
-            Assert.That(result.Count, Is.EqualTo(includeTransitive ? 2 : 1));
+            Assert.That(result.Count, Is.EqualTo(includeTransitive ? 3 : 1));
         }
 
         [Test]
@@ -155,15 +155,15 @@ public void GetInstalledPackagesShould_ThrowError_For_PackagesForNativeCppProjec
         [TestCase("net8.0", false, "Microsoft.Extensions.Logging.Abstractions")]
         [TestCase("net8.0-browser", false, "Microsoft.Extensions.Logging.Abstractions")]
         [TestCase("net6.0", true, "TinyCsvParser")]
-        [TestCase("net8.0", true, "Microsoft.Extensions.Logging.Abstractions", "Microsoft.Extensions.DependencyInjection.Abstractions")]
-        [TestCase("net8.0-browser", true, "Microsoft.Extensions.Logging.Abstractions", "Microsoft.Extensions.DependencyInjection.Abstractions")]
+        [TestCase("net8.0", true, "Microsoft.Extensions.Logging.Abstractions", "Microsoft.Extensions.DependencyInjection.Abstractions", "System.Diagnostics.DiagnosticSource")]
+        [TestCase("net8.0-browser", true, "Microsoft.Extensions.Logging.Abstractions", "Microsoft.Extensions.DependencyInjection.Abstractions", "System.Diagnostics.DiagnosticSource")]
         public void GetInstalledPackagesShould_OnlyReturn_PackagesPackagesReferencedByRequestedFramework(string framework, bool includeTransitive, params string[] packages)
         {
             string path = Path.GetFullPath("../../../../targets/MultiTargetProjectWithDifferentDependencies/MultiTargetProjectWithDifferentDependencies.csproj");
 
             IEnumerable<PackageIdentity> result = _uut!.GetInstalledPackages(path, includeTransitive, framework);
 
-            Assert.That(packages, Is.EquivalentTo(result.Select(p => p.Id)));
+            Assert.That(result.Select(p => p.Id), Is.EquivalentTo(packages));
         }
     }
 }
diff --git a/...TargetProjectWithDifferentDependencies/MultiTargetProjectWithDifferentDependencies.csproj b/...TargetProjectWithDifferentDependencies/MultiTargetProjectWithDifferentDependencies.csproj
@@ -8,6 +8,6 @@
     <PackageReference Include="TinyCsvParser" Version="2.7.1" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-browser'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.*" />
   </ItemGroup>
 </Project>
diff --git a/tests/targets/PackagesConfigProject/PackagesConfigProject.csproj b/tests/targets/PackagesConfigProject/PackagesConfigProject.csproj
@@ -47,8 +47,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="TinyCsvParser, Version=2.7.0.0, Culture=neutral, PublicKeyToken=d7df35b038077099, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\TinyCsvParser.2.7.0\lib\netstandard2.0\TinyCsvParser.dll</HintPath>
+    <Reference Include="TinyCsvParser, Version=2.7.1.0, Culture=neutral, PublicKeyToken=d7df35b038077099, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\TinyCsvParser.2.7.1\lib\netstandard2.0\TinyCsvParser.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/targets/PackagesConfigProject/packages.config b/tests/targets/PackagesConfigProject/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="TinyCsvParser" version="2.7.0" targetFramework="net472" />
+  <package id="TinyCsvParser" version="2.7.1" targetFramework="net472" />
 </packages>
diff --git a/tests/targets/VersionRangesProject/VersionRangesProject.csproj b/tests/targets/VersionRangesProject/VersionRangesProject.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.2]" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0]" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/targets/slnx/slnx.slnx b/tests/targets/slnx/slnx.slnx
@@ -0,0 +1,8 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Debug" />
+    <BuildType Name="Release" />
+    <BuildType Name="TestWindows" />
+  </Configurations>
+  <Project Path="../ProjectWithTransitiveNuget/ProjectWithTransitiveNuget.csproj" Id="875c0575-95c4-4006-a910-bb1555c90c75" />
+</Solution>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{SolutionDirectory}tests\targets\PackageReferenceProject\PackageReferenceProject.csproj,{SolutionDirectory}tests\targets\PackagesConfigProject\PackagesConfigProject.csproj,{SolutionDirectory}tests\targets\ProjectWithoutNugetReferences\ProjectWithoutNugetReferences.csproj,{SolutionDirectory}tests\targets\ProjectWithTransitiveNuget\ProjectWithTransitiveNuget.csproj,{SolutionDirectory}tests\targets\ProjectWithTransitiveReferences\ProjectWithTransitiveReferences.csproj