net6.0-windows7 compatibility added. (#9364)

NuGet · Jan 30, 2023 · 6f0bd1e · 6f0bd1e
1 parent 92ae551
commit 6f0bd1e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/src/NuGetGallery.Core/Frameworks/FrameworkCompatibilityService.cs b/src/NuGetGallery.Core/Frameworks/FrameworkCompatibilityService.cs
@@ -61,6 +61,11 @@ private static IReadOnlyDictionary<NuGetFramework, ISet<NuGetFramework>> GetComp
                 }
             }
 
+            matrix.Add(SupportedFrameworks.Net60Windows7, 
+                new HashSet<NuGetFramework>() {
+                    SupportedFrameworks.Net60Windows, SupportedFrameworks.Net60Windows7,
+                    SupportedFrameworks.Net70Windows, SupportedFrameworks.Net70Windows7 });
+
             return matrix;
         }
     }

diff --git a/src/NuGetGallery.Core/Frameworks/SupportedFrameworks.cs b/src/NuGetGallery.Core/Frameworks/SupportedFrameworks.cs
@@ -50,6 +50,9 @@ public static class SupportedFrameworks
         public static readonly NuGetFramework XamarinMac = new NuGetFramework(FrameworkIdentifiers.XamarinMac, EmptyVersion);
         public static readonly NuGetFramework XamarinTvOs = new NuGetFramework(FrameworkIdentifiers.XamarinTVOS, EmptyVersion);
         public static readonly NuGetFramework XamarinWatchOs = new NuGetFramework(FrameworkIdentifiers.XamarinWatchOS, EmptyVersion);
+
+        public static readonly NuGetFramework Net60Windows7 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version6, "windows", Version7);
+        public static readonly NuGetFramework Net70Windows7 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "windows", Version7);
 
         public static readonly IReadOnlyList<NuGetFramework> AllSupportedNuGetFrameworks;
 

diff --git a/tests/NuGetGallery.Core.Facts/Frameworks/FrameworkCompatibilityServiceFacts.cs b/tests/NuGetGallery.Core.Facts/Frameworks/FrameworkCompatibilityServiceFacts.cs
@@ -96,5 +96,23 @@ public void ValidPackageFrameworksReturnsFrameworksCompatibleForAtLeastOne(param
                 Assert.True(isCompatible);
             }
         }
+
+        [Theory]
+        [InlineData("net6.0-windows7.0", "net6.0-windows", "net6.0-windows7.0", "net7.0-windows", "net7.0-windows7.0")]
+        public void WindowsPlatformVersionsShouldContainAllSpecifiedFrameworks(string windowsDefaultVersionFramework, params string[]  windowsProjectFrameworks) 
+        {
+            var packageFramework = NuGetFramework.Parse(windowsDefaultVersionFramework);
+            var projectFrameworks = new HashSet<NuGetFramework>();
+
+            foreach (var frameworkName in windowsProjectFrameworks) {
+                projectFrameworks.Add(NuGetFramework.Parse(frameworkName));
+            }
+
+            var compatibleFrameworks = _service.GetCompatibleFrameworks(new HashSet<NuGetFramework>() { packageFramework });
+            Assert.Equal(windowsProjectFrameworks.Length, compatibleFrameworks.Count);
+
+            var containsAllCompatibleFrameworks = compatibleFrameworks.All(cf => projectFrameworks.Contains(cf));
+            Assert.True(containsAllCompatibleFrameworks);
+        }
     }
 }