Skip to content

Commit

Permalink
Provisionator's XcodeSelect now configures Xamarin Settings.plist (#1…
Browse files Browse the repository at this point in the history 
…5079)
  • Loading branch information
@sandyarmstrong
sandyarmstrong authored May 23, 2022
1 parent 0590cf9 commit 6632f88
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 67 deletions.
25 changes: 0 additions & 25 deletions tools/devops/build-provisioning.csx.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,3 @@ Item ("@MONO_PACKAGE@");
Item ("@MIN_SHARPIE_URL@");
Item ("@VS_PACKAGE@");
DotNetCoreSdk ("@SYSTEM_DOTNET_VERSION@");

var appleSdkOverride = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "Library", "Preferences", "Xamarin", "Settings.plist");
Item ("Override Apple SDK Settings")
.Condition (item => !File.Exists (appleSdkOverride) || GetSettingValue (appleSdkOverride, "AppleSdkRoot") != GetSelectedXcodePath ())
.Action (item => {
DeleteSafe (appleSdkOverride);
CreateSetting (appleSdkOverride, "AppleSdkRoot", GetSelectedXcodePath ());
Console.WriteLine ($"New VSMac iOS SDK Location: {GetSelectedXcodePath ()}");
});

void DeleteSafe (string file)
{
if (File.Exists (file))
File.Delete (file);
}

void CreateSetting (string settingFile, string key, string value)
{
Exec ("defaults", "write", settingFile, key, value);
}

string GetSettingValue (string settingFile, string keyName)
{
return Exec ("defaults", "read", settingFile, keyName).FirstOrDefault ();
}
25 changes: 0 additions & 25 deletions tools/devops/device-tests-provisioning.csx.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,3 @@ Item ("@MIN_SHARPIE_URL@");
DotNetCoreSdk ("@SYSTEM_DOTNET_VERSION@");

BrewPackages ("p7zip");

var appleSdkOverride = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "Library", "Preferences", "Xamarin", "Settings.plist");
Item ("Override Apple SDK Settings")
.Condition (item => !File.Exists (appleSdkOverride) || GetSettingValue (appleSdkOverride, "AppleSdkRoot") != GetSelectedXcodePath ())
.Action (item => {
DeleteSafe (appleSdkOverride);
CreateSetting (appleSdkOverride, "AppleSdkRoot", GetSelectedXcodePath ());
Console.WriteLine ($"New VSMac iOS SDK Location: {GetSelectedXcodePath ()}");
});

void DeleteSafe (string file)
{
if (File.Exists (file))
File.Delete (file);
}

void CreateSetting (string settingFile, string key, string value)
{
Exec ("defaults", "write", settingFile, key, value);
}

string GetSettingValue (string settingFile, string keyName)
{
return Exec ("defaults", "read", settingFile, keyName).FirstOrDefault ();
}
8 changes: 0 additions & 8 deletions tools/devops/provision-shared.csx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,6 @@ bool IsAtLeastVersion(string actualVer, string minVer)
return actualVerChars.Length > minVerChars.Length;
}

void CreateSetting (string settingFile, string key, string value) => Exec ("defaults", "write", settingFile, key, value);
string GetSettingValue (string settingFile, string keyName) => Exec ("defaults", "read", settingFile, keyName).FirstOrDefault ();
void DeleteSafe (string file)
{
if (File.Exists (file))
File.Delete (file);
}

void RemoveXcodeSymlinks (string xcodePath)
{
Console.WriteLine ($"Checkig if '{xcodePath}' is a symlink...");
Expand Down
9 changes: 0 additions & 9 deletions tools/devops/provision-xcode.csx.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,4 @@ RemoveXcodeSymlinks (reqXcode);
// Provision Xcode using the xip name declared in Make.config
Xcode ("@XCODE_XIP_NAME@").XcodeSelect (allowUntrusted: true);

var appleSdkOverride = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "Library", "Preferences", "Xamarin", "Settings.plist");
Item ("Override Apple SDK Settings")
.Condition (item => !File.Exists (appleSdkOverride) || GetSettingValue (appleSdkOverride, "AppleSdkRoot") != GetSelectedXcodePath ())
.Action (item => {
DeleteSafe (appleSdkOverride);
CreateSetting (appleSdkOverride, "AppleSdkRoot", GetSelectedXcodePath ());
Console.WriteLine ($"New VSMac iOS SDK Location: {GetSelectedXcodePath ()}");
});

LogInstalledXcodes ();

5 comments on commit 6632f88

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

📋 [CI Build] API Diff 📋

API diff (for current PR)

ℹ️ API Diff (from PR only) (please review changes)

API diff: vsdrops gist

Xamarin
.NET
Xamarin vs .NET
iOS vs Mac Catalyst (.NET)

API diff (vs stable)

✅ API Diff from stable

API diff: vsdrops gist

Xamarin
.NET
Xamarin vs .NET
iOS vs Mac Catalyst (.NET)

Generator diff

✅ Generator Diff (no change)

Pipeline on Agent XAMMINI-058.Monterey'
Hash: 6632f88769fd30f24e0a682953c89b594af2a493

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

💻 [CI Build] Tests on macOS Mac Catalina (10.15) passed 💻

✅ All tests on macOS Mac Catalina (10.15) passed.

Pipeline on Agent
Hash: 6632f88769fd30f24e0a682953c89b594af2a493

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

💻 [CI Build] Tests on macOS M1 - Mac Big Sur (11.5) passed 💻

✅ All tests on macOS M1 - Mac Big Sur (11.5) passed.

Pipeline on Agent
Hash: 6632f88769fd30f24e0a682953c89b594af2a493

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

📚 [CI Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMMINI-057.Monterey
Hash: 6632f88769fd30f24e0a682953c89b594af2a493

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

❌ [CI Build] Tests failed on VSTS: simulator tests iOS ❌

Tests failed on VSTS: simulator tests iOS.

Test results

1028 tests' device not found, 228 tests passed.

Pipeline on Agent XAMBOT-1035.Monterey
Provisionator's XcodeSelect now configures Xamarin Settings.plist (#15079)

Please sign in to comment.