Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,12 @@ static Microsoft.CodeAnalysis.Testing.DiagnosticResult.CompilerError(string iden
static Microsoft.CodeAnalysis.Testing.DiagnosticResult.CompilerWarning(string identifier) -> Microsoft.CodeAnalysis.Testing.DiagnosticResult
static Microsoft.CodeAnalysis.Testing.IVerifierExtensions.EqualOrDiff(this Microsoft.CodeAnalysis.Testing.IVerifier verifier, string expected, string actual, string message = null) -> void
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Default.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net100Android.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net100MacCatalyst.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net100MacOS.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net100TvOS.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net100Windows.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net100iOS.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net50.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60Android.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
Expand Down Expand Up @@ -294,6 +300,7 @@ static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net90MacOS.get ->
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net90TvOS.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net90Windows.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net90iOS.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net100.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore.NetCoreApp10.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore.NetCoreApp11.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
static Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.NetCore.NetCoreApp20.get -> Microsoft.CodeAnalysis.Testing.ReferenceAssemblies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1200,45 +1200,98 @@ public static class Net
"net9.0",
new PackageIdentity(
"Microsoft.NETCore.App.Ref",
"9.0.0-preview.1.24080.9"),
"9.0.0"),
Path.Combine("ref", "net9.0"));
});

private static readonly Lazy<ReferenceAssemblies> _lazyNet90Windows =
new Lazy<ReferenceAssemblies>(() =>
Net90.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.WindowsDesktop.App.Ref", "9.0.0-preview.1.24081.3"))));
new PackageIdentity("Microsoft.WindowsDesktop.App.Ref", "9.0.0"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet90MacOS =
new Lazy<ReferenceAssemblies>(() =>
Net90.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.macOS.Ref", "14.2.9088-net9-p1"))));
new PackageIdentity("Microsoft.macOS.Ref.net9.0_15.0", "15.0.9617"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet90Android =
new Lazy<ReferenceAssemblies>(() =>
Net90.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.Android.Ref.34", "34.99.0-preview.1.151"))));
new PackageIdentity("Microsoft.Android.Ref.34", "34.99.0-preview.6.340"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet90iOS =
new Lazy<ReferenceAssemblies>(() =>
Net90.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.iOS.Ref", "17.2.9088-net9-p1"))));
new PackageIdentity("Microsoft.iOS.Ref.net9.0_18.0", "18.0.9617"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet90MacCatalyst =
new Lazy<ReferenceAssemblies>(() =>
Net90.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.MacCatalyst.Ref", "17.2.9088-net9-p1"))));
new PackageIdentity("Microsoft.MacCatalyst.Ref.net9.0_18.0", "18.0.9617"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet90TvOS =
new Lazy<ReferenceAssemblies>(() =>
Net90.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.tvOS.Ref", "17.2.9088-net9-p1"))));
new PackageIdentity("Microsoft.tvOS.Ref.net9.0_18.0", "18.0.9617"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet100 =
new Lazy<ReferenceAssemblies>(() =>
{
if (!NuGetFramework.Parse("net10.0").IsPackageBased)
{
// The NuGet version provided at runtime does not recognize the 'net10.0' target framework
throw new NotSupportedException("The 'net10.0' target framework is not supported by this version of NuGet.");
}

return new ReferenceAssemblies(
"net10.0",
new PackageIdentity(
"Microsoft.NETCore.App.Ref",
"10.0.0-rc.1.25451.107"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also update the .NET 9 reference packages to point to a GA version rather than preview1?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Path.Combine("ref", "net10.0"));
});

private static readonly Lazy<ReferenceAssemblies> _lazyNet100Windows =
new Lazy<ReferenceAssemblies>(() =>
Net100.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.WindowsDesktop.App.Ref", "10.0.0-rc.1.25451.107"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet100MacOS =
new Lazy<ReferenceAssemblies>(() =>
Net100.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.macOS.Ref.net10.0_15.5", "15.5.10727-net10-rc.1"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet100Android =
new Lazy<ReferenceAssemblies>(() =>
Net100.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.Android.Ref.36", "36.0.0-rc.1.285"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet100iOS =
new Lazy<ReferenceAssemblies>(() =>
Net100.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.iOS.Ref.net10.0_18.5", "18.5.10727-net10-rc.1"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet100MacCatalyst =
new Lazy<ReferenceAssemblies>(() =>
Net100.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.MacCatalyst.Ref.net10.0_18.5", "18.5.10727-net10-rc.1"))));

private static readonly Lazy<ReferenceAssemblies> _lazyNet100TvOS =
new Lazy<ReferenceAssemblies>(() =>
Net100.AddPackages(
ImmutableArray.Create(
new PackageIdentity("Microsoft.tvOS.Ref.net10.0_18.5", "18.5.10727-net10-rc.1"))));

public static ReferenceAssemblies Net50 => _lazyNet50.Value;

Expand Down Expand Up @@ -1297,6 +1350,20 @@ public static class Net
public static ReferenceAssemblies Net90MacCatalyst => _lazyNet90MacCatalyst.Value;

public static ReferenceAssemblies Net90TvOS => _lazyNet90TvOS.Value;

public static ReferenceAssemblies Net100 => _lazyNet100.Value;

public static ReferenceAssemblies Net100Windows => _lazyNet100Windows.Value;

public static ReferenceAssemblies Net100Android => _lazyNet100Android.Value;

public static ReferenceAssemblies Net100iOS => _lazyNet100iOS.Value;

public static ReferenceAssemblies Net100MacOS => _lazyNet100MacOS.Value;

public static ReferenceAssemblies Net100MacCatalyst => _lazyNet100MacCatalyst.Value;

public static ReferenceAssemblies Net100TvOS => _lazyNet100TvOS.Value;
}

public static class NetStandard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,13 @@ public async Task ResolveReferenceAssemblies_Net60()
[InlineData("net9.0-macos")]
[InlineData("net9.0-maccatalyst")]
[InlineData("net9.0-tvos")]
[InlineData("net10.0")]
[InlineData("net10.0-windows")]
[InlineData("net10.0-android")]
[InlineData("net10.0-ios")]
[InlineData("net10.0-macos")]
[InlineData("net10.0-maccatalyst")]
[InlineData("net10.0-tvos")]
#endif
[InlineData("netstandard1.0")]
[InlineData("netstandard1.1")]
Expand Down Expand Up @@ -733,6 +740,13 @@ internal static ReferenceAssemblies ReferenceAssembliesForTargetFramework(string
"net9.0-macos" => ReferenceAssemblies.Net.Net90MacOS,
"net9.0-maccatalyst" => ReferenceAssemblies.Net.Net90MacCatalyst,
"net9.0-tvos" => ReferenceAssemblies.Net.Net90TvOS,
"net10.0" => ReferenceAssemblies.Net.Net100,
"net10.0-windows" => ReferenceAssemblies.Net.Net100Windows,
"net10.0-android" => ReferenceAssemblies.Net.Net100Android,
"net10.0-ios" => ReferenceAssemblies.Net.Net100iOS,
"net10.0-macos" => ReferenceAssemblies.Net.Net100MacOS,
"net10.0-maccatalyst" => ReferenceAssemblies.Net.Net100MacCatalyst,
"net10.0-tvos" => ReferenceAssemblies.Net.Net100TvOS,
"netstandard1.0" => ReferenceAssemblies.NetStandard.NetStandard10,
"netstandard1.1" => ReferenceAssemblies.NetStandard.NetStandard11,
"netstandard1.2" => ReferenceAssemblies.NetStandard.NetStandard12,
Expand Down