Skip to content

Conversation

@wjk
Copy link
Contributor

@wjk wjk commented Aug 19, 2019

Does mostly what the title says. I also took the opportunity to update an occurrence of "OS X" to the current branding.

Please note that I was not able to change the corresponding value for the iOS platform because those constants are in the Xamarin.MacDev submodule, and if I was make the changes in a fork, I would then have problems properly reintegrating the submodule change into this repository. I have included the required changes as a diff below; if someone could apply them for me (or tell me how I should best apply them myself), I would appreciate it. Thanks!

diff --git a/Xamarin.MacDev/IPhoneCertificate.cs b/Xamarin.MacDev/IPhoneCertificate.cs
index 326b041..efa96de 100644
--- a/Xamarin.MacDev/IPhoneCertificate.cs
+++ b/Xamarin.MacDev/IPhoneCertificate.cs
@@ -13,8 +13,8 @@ namespace Xamarin.MacDev
 {
 	public static class IPhoneCertificate
 	{
-		public static readonly string[] DevelopmentPrefixes = { "iPhone Developer", "iOS Development" };
-		public static readonly string[] DistributionPrefixes = { "iPhone Distribution", "iOS Distribution" };
+		public static readonly string[] DevelopmentPrefixes = { "iPhone Developer", "iOS Development", "Apple Development" };
+		public static readonly string[] DistributionPrefixes = { "iPhone Distribution", "iOS Distribution", "Apple Distribution" };
 
 		public static bool IsDevelopment (string name)
 		{

@spouliot
Copy link
Contributor

build

@monojenkins
Copy link
Collaborator

Build success
Build succeeded
API Diff (from stable)
API Diff (from PR only) (no change)
Generator Diff (no change)
Test run succeeded

@rolfbjarne
Copy link
Member

Please note that I was not able to change the corresponding value for the iOS platform because those constants are in the Xamarin.MacDev submodule, and if I was make the changes in a fork, I would then have problems properly reintegrating the submodule change into this repository.

The way to do this is to create a fork of the Xamarin.MacDev, create a pull request with your changes, and once that pull request has been merged, update this pull request with the submodule bump.

protected override string DeveloperRoot { get { return MacOSXSdks.Native.DeveloperRoot; } }
protected override PlatformFramework Framework { get { return PlatformFramework.MacOS; } }
protected override string PlatformName { get { return "OS X"; } }
protected override string PlatformName { get { return "macOS"; } }
Copy link
Member

Choose a reason for hiding this comment

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

Not quite sure about this one but as long as our tests are happy 👍

@mandel-macaque mandel-macaque added the note-highlight Worth calling out specifically in release notes label Aug 28, 2019
@mandel-macaque mandel-macaque merged commit 3f3c8bc into dotnet:master Aug 28, 2019
@wjk wjk deleted the apple-development branch August 28, 2019 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

community Community contribution ❤ note-highlight Worth calling out specifically in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants