Skip to content

Multi-target with .NET 10. #142

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

Merged
rolfbjarne merged 1 commit into from
Jan 15, 2026
+15 −1
Merged

Multi-target with .NET 10. #142

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
1 change: 1 addition & 0 deletions UnitTests/UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net10.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="4.1.0" />
Expand Down
8 changes: 8 additions & 0 deletions Xamarin.MacDev/Keychain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,11 @@ public IList<AppleCodeSigningIdentity> GetAllSigningIdentities ()

if (rawData != null) {
try {
#if NET9_0_OR_GREATER
certificate = X509CertificateLoader.LoadCertificate (rawData);
#else
certificate = new X509Certificate2 (rawData);
#endif
} catch (Exception ex) {
LoggingService.LogWarning ("Error loading signing certificate from keychain", ex);
}
Expand Down Expand Up @@ -515,7 +519,11 @@ public IList<X509Certificate2> GetAllSigningCertificates ()

if (rawData != null) {
try {
#if NET9_0_OR_GREATER
certs.Add (X509CertificateLoader.LoadCertificate (rawData));
#else
certs.Add (new X509Certificate2 (rawData));
#endif
} catch (Exception ex) {
LoggingService.LogWarning ("Error loading signing certificate from keychain", ex);
}
Expand Down
4 changes: 4 additions & 0 deletions Xamarin.MacDev/MobileProvision.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,11 @@ static IList<X509Certificate2> GetCertificates (PArray array)
var data = item as PData;

if (data != null)
#if NET9_0_OR_GREATER
list.Add (X509CertificateLoader.LoadCertificate (data.Value));
#else
list.Add (new X509Certificate2 (data.Value));
#endif
}

return list;
Expand Down
3 changes: 2 additions & 1 deletion Xamarin.MacDev/Xamarin.MacDev.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>latest</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
Expand Down
Loading