Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ReferenceAssemblies.NetFramework.Net35 #907

Merged
merged 1 commit into from
Sep 28, 2021
Merged

Add ReferenceAssemblies.NetFramework.Net35 #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...soft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -261,6 +262,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
Expand Down
22 changes: 21 additions & 1 deletion ...osoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/ReferenceAssemblies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));

Expand Down Expand Up @@ -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; }
Expand Down
26 changes: 26 additions & 0 deletions ...lysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.UnitTests/MetadataReferenceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down Expand Up @@ -431,6 +455,7 @@ public async Task ResolveReferenceAssemblies_Net50()
}

[Theory]
[InlineData("net35")]
[InlineData("net40")]
[InlineData("net45")]
[InlineData("net451")]
Expand Down Expand Up @@ -483,6 +508,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,
Expand Down