Skip to content

Commit

Permalink
Bump to dotnet/sdk@e1a2886f56 10.0.100-preview.1.25106.28 (#9762)
Browse files Browse the repository at this point in the history
Changes: dotnet/sdk@18f7c61...e1a2886

Updates: Microsoft.NET.Sdk: from 10.0.100-preview.1.25104.22 to 10.0.100-preview.1.25106.28

Other changes:

Pass `--azure-feed https://ci.dot.net/public` to `dotnet-install` scripts to avoid the error:

    Step Xamarin.Android.Prepare.Step_InstallDotNetPreview failed: Failed to download https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.1.25105.26/dotnet-sdk-10.0.100-preview.1.25105.26-osx-arm64.tar.gz

The `builds.dotnet.microsoft.com` domain does not appear to work.

Co-authored-by: Jonathan Peppers <[email protected]>
  • Loading branch information
dotnet-maestro[bot] and jonathanpeppers authored Feb 7, 2025
1 parent 4b28c3e commit 6ec531d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ async Task<bool> DownloadDotNetInstallScript (Context context, string dotnetScri
Log.StatusLine ("Downloading dotnet-install script...");

if (File.Exists (dotnetScriptPath)) {
Log.WarningLine ($"Using cached installation script found in '{dotnetScriptPath}'");
if (!bool.TryParse (Environment.GetEnvironmentVariable ("RunningOnCI"), out var ci) || !ci) {
Log.WarningLine ($"Using cached installation script found in '{dotnetScriptPath}'");
}
return true;
}

Expand Down Expand Up @@ -143,11 +145,13 @@ async Task<bool> DownloadDotNetArchive (Context context, string archiveDestinati

string[] GetInstallationScriptArgs (string version, string dotnetPath, string dotnetScriptPath, bool onlyGetUrls, bool runtimeOnly)
{
const string feed = "https://ci.dot.net/public";

List<string> args;
if (Context.IsWindows) {
args = new List<string> {
"-NoProfile", "-ExecutionPolicy", "unrestricted", "-file", dotnetScriptPath,
"-Version", version, "-InstallDir", dotnetPath, "-Verbose"
"-Version", version, "-InstallDir", dotnetPath, "-AzureFeed", feed, "-Verbose"
};
if (runtimeOnly) {
args.AddRange (new string [] { "-Runtime", "dotnet" });
Expand All @@ -160,7 +164,7 @@ string[] GetInstallationScriptArgs (string version, string dotnetPath, string do
}

args = new List<string> {
dotnetScriptPath, "--version", version, "--install-dir", dotnetPath, "--verbose"
dotnetScriptPath, "--version", version, "--install-dir", dotnetPath, "--azure-feed", feed, "--verbose",
};

if (runtimeOnly) {
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.1.25104.22">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.1.25106.28">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>18f7c61557bd4f9e2fabb5c550dc00b9a9a596d5</Sha>
<Sha>e1a2886f5628dfdf192225870a62a1d029da68fb</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.1.25080.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25104.22</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25106.28</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETCoreAppRefPackageVersion>
Expand Down

0 comments on commit 6ec531d

Please sign in to comment.