Merge pull request #907 from sharwell/net35

Add ReferenceAssemblies.NetFramework.Net35
dotnet · Sep 28, 2021 · 5c5865f · 5c5865f
2 parents aba633c + 459295c
commit 5c5865f
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/...soft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/PublicAPI.Unshipped.txt b/...soft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/PublicAPI.Unshipped.txt
@@ -176,6 +176,7 @@ Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net
 Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore
 Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework
 Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net20
+Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net35
 Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net40
 Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net45
 Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net451
@@ -267,6 +268,9 @@ static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore.NetCoreApp30.g
 static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore.NetCoreApp31.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
 static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net20.Default.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
 static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net20.WindowsForms.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
+static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net35.Default.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
+static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net35.WindowsForms.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
+static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net35.Wpf.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
 static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net40.Default.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
 static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net40.WindowsForms.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
 static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetFramework.Net40.Wpf.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies

diff --git a/...osoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/ReferenceAssemblies.cs b/...osoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/ReferenceAssemblies.cs
@@ -27,7 +27,7 @@ namespace Microsoft.CodeAnalysis.Testing
 {
     public sealed partial class ReferenceAssemblies
     {
-        private const string ReferenceAssembliesPackageVersion = "1.0.0";
+        private const string ReferenceAssembliesPackageVersion = "1.0.2";
 
         private static readonly FileSystemSemaphore Semaphore = new FileSystemSemaphore(Path.Combine(Path.GetTempPath(), "test-packages", ".lock"));
 
@@ -579,6 +579,26 @@ public static class Net20
                     = Default.AddAssemblies(ImmutableArray.Create("System.Drawing", "System.Windows.Forms"));
             }
 
+            public static class Net35
+            {
+                public static ReferenceAssemblies Default { get; }
+                    = new ReferenceAssemblies(
+                        "net35",
+                        new PackageIdentity(
+                            "Microsoft.NETFramework.ReferenceAssemblies.net35",
+                            ReferenceAssembliesPackageVersion),
+                        Path.Combine("build", ".NETFramework", "v3.5"))
+                    .WithAssemblyIdentityComparer(DesktopAssemblyIdentityComparer.Default)
+                    .AddAssemblies(ImmutableArray.Create("mscorlib", "System", "System.Core", "System.Data", "System.Data.DataSetExtensions", "System.Xml", "System.Xml.Linq"))
+                    .AddLanguageSpecificAssemblies(LanguageNames.VisualBasic, ImmutableArray.Create("Microsoft.VisualBasic"));
+
+                public static ReferenceAssemblies WindowsForms { get; }
+                    = Default.AddAssemblies(ImmutableArray.Create("System.Deployment", "System.Drawing", "System.Windows.Forms"));
+
+                public static ReferenceAssemblies Wpf { get; }
+                    = Default.AddAssemblies(ImmutableArray.Create("PresentationCore", "PresentationFramework", "WindowsBase"));
+            }
+
             public static class Net40
             {
                 public static ReferenceAssemblies Default { get; }

diff --git a/...lysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.UnitTests/MetadataReferenceTests.cs b/...lysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.UnitTests/MetadataReferenceTests.cs
@@ -29,6 +29,30 @@ public async Task ResolveReferenceAssemblies_Net20_WindowsForms()
             Assert.NotEmpty(resolved);
         }
 
+        [Fact]
+        public async Task ResolveReferenceAssemblies_Net35()
+        {
+            var referenceAssemblies = ReferenceAssemblies.NetFramework.Net35.Default;
+            var resolved = await referenceAssemblies.ResolveAsync(LanguageNames.CSharp, CancellationToken.None);
+            Assert.NotEmpty(resolved);
+        }
+
+        [Fact]
+        public async Task ResolveReferenceAssemblies_Net35_WindowsForms()
+        {
+            var referenceAssemblies = ReferenceAssemblies.NetFramework.Net35.WindowsForms;
+            var resolved = await referenceAssemblies.ResolveAsync(LanguageNames.CSharp, CancellationToken.None);
+            Assert.NotEmpty(resolved);
+        }
+
+        [Fact]
+        public async Task ResolveReferenceAssemblies_Net35_Wpf()
+        {
+            var referenceAssemblies = ReferenceAssemblies.NetFramework.Net35.Wpf;
+            var resolved = await referenceAssemblies.ResolveAsync(LanguageNames.CSharp, CancellationToken.None);
+            Assert.NotEmpty(resolved);
+        }
+
         [Fact]
         public async Task ResolveReferenceAssemblies_Net40()
         {
@@ -550,6 +574,7 @@ public async Task ResolveReferenceAssemblies_Net60()
         }
 
         [Theory]
+        [InlineData("net35")]
         [InlineData("net40")]
         [InlineData("net45")]
         [InlineData("net451")]
@@ -608,6 +633,7 @@ internal static ReferenceAssemblies ReferenceAssembliesForTargetFramework(string
             return targetFramework switch
             {
                 "net20" => ReferenceAssemblies.NetFramework.Net20.Default,
+                "net35" => ReferenceAssemblies.NetFramework.Net35.Default,
                 "net40" => ReferenceAssemblies.NetFramework.Net40.Default,
                 "net45" => ReferenceAssemblies.NetFramework.Net45.Default,
                 "net451" => ReferenceAssemblies.NetFramework.Net451.Default,