Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,15 @@ list-nunit-tests:
include build-tools/scripts/runtime-helpers.mk

.PHONY: prepare
prepare:
prepare: install-dotnet
$(call SYSTEM_DOTNET_BINLOG,prepare-run,run) $(PREPARE_MSBUILD_FLAGS) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- $(_PREPARE_ARGS)
$(call SYSTEM_DOTNET_BINLOG,prepare-bootstrap) Xamarin.Android.BootstrapTasks.sln
$(call DOTNET_BINLOG,prepare-java.interop) $(SOLUTION) -t:PrepareJavaInterop

.PHONY: install-dotnet
install-dotnet:
./eng/install-dotnet.sh

.PHONY: prepare-help
prepare-help:
$(call SYSTEM_DOTNET_BINLOG,prepare-help,run) --project "$(PREPARE_PROJECT)" --framework $(PREPARE_NET_FX) -- -h
Expand Down
8 changes: 7 additions & 1 deletion build-tools/scripts/PrepareWindows.targets
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@
<_XAPrepareStandardArgs Condition=" '$(XA_FORCE_COMPONENT_REFRESH)' == 'true' ">$(_XAPrepareStandardArgs) -refresh</_XAPrepareStandardArgs>
</PropertyGroup>
<Import Project="$(_TopDir)\Configuration.props" />
<Target Name="_BuildXAPrepare">
<Target Name="_InstallDotNet">
<Exec
Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(_TopDir)\eng\install-dotnet.ps1&quot; -configuration $(Configuration)"
WorkingDirectory="$(_TopDir)"
/>
</Target>
<Target Name="_BuildXAPrepare" DependsOnTargets="_InstallDotNet">
<MSBuild Projects="$(MSBuildThisFileDirectory)..\xaprepare\xaprepare.sln" Targets="Restore;Build" />
</Target>
<Target Name="Prepare"
Expand Down
5 changes: 0 additions & 5 deletions build-tools/xaprepare/xaprepare/Application/Context.cs
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,6 @@ public string DebugFileExtension {
}
}

/// <summary>
/// Path to a local .NET SDK archive to use instead of downloading.
/// </summary>
public string? LocalDotNetSdkArchive { get; set; }

/// <summary>
/// Determines whether or not we are running on a hosted azure pipelines agent.
/// These agents have certain limitations, the most pressing being the amount of available storage.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,5 @@ partial class Defaults
{
public const string DefaultCompiler = "cc";
}

partial class Urls
{
// This is the "public" url that we really should be using, but it keeps failing with:
// AuthenticationException: The remote certificate is invalid because of errors in the certificate chain: RevocationStatusUnknown
// For now we'll grab it directly from GitHub
// public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,5 @@ partial class Defaults
partial class Paths
{
}

partial class Urls
{
public static readonly Uri DotNetInstallScript = new Uri ("https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1");
}
}
}
3 changes: 0 additions & 3 deletions build-tools/xaprepare/xaprepare/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ sealed class ParsedOptions
public string? Configuration { get; set; }
public bool AutoProvision { get; set; }
public bool AutoProvisionUsesSudo { get; set; }
public string? LocalDotNetSdkArchive { get; set; }
}

public static int Main (string[] args)
Expand Down Expand Up @@ -98,7 +97,6 @@ static async Task<int> Run (string[] args)
"",
{"auto-provision=", $"Automatically install software required by .NET for Android", v => parsedOptions.AutoProvision = ParseBoolean (v)},
{"auto-provision-uses-sudo=", $"Allow use of sudo(1) when provisioning", v => parsedOptions.AutoProvisionUsesSudo = ParseBoolean (v)},
{"dotnet-sdk-archive=", "Path to a local .NET SDK archive (zip or tar.gz) to use instead of downloading from the internet.", v => parsedOptions.LocalDotNetSdkArchive = v?.Trim () },
"",
{"h|help", "Show this help message", v => parsedOptions.ShowHelp = true },
};
Expand Down Expand Up @@ -128,7 +126,6 @@ static async Task<int> Run (string[] args)
Context.Instance.DebugFileExtension = parsedOptions.DebugFileExtension;
Context.Instance.AutoProvision = parsedOptions.AutoProvision;
Context.Instance.AutoProvisionUsesSudo = parsedOptions.AutoProvisionUsesSudo;
Context.Instance.LocalDotNetSdkArchive = parsedOptions.LocalDotNetSdkArchive;

if (!String.IsNullOrEmpty (parsedOptions.Configuration))
Context.Instance.Configuration = parsedOptions.Configuration!;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protected Scenario_AndroidTestDependencies (string name, string description)

protected override void AddSteps (Context context)
{
Steps.Add (new Step_InstallDotNetPreview ());
Steps.Add (new Step_PrepareDotNetWorkloads ());
Comment thread
jonathanpeppers marked this conversation as resolved.
Resolved

// disable installation of missing programs...
context.SetCondition (KnownConditions.AllowProgramInstallation, false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ protected override void AddSteps (Context context)
if (context == null)
throw new ArgumentNullException (nameof (context));

Steps.Add (new Step_InstallDotNetPreview ());
Steps.Add (new Step_PrepareDotNetWorkloads ());
Steps.Add (new Step_GenerateFiles (atBuildStart: true));
Steps.Add (new Step_GenerateCGManifest ());
}
Expand Down
220 changes: 0 additions & 220 deletions build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs

This file was deleted.

Loading
Loading