Skip to content

Commit 6ec531d

Browse files
Bump to dotnet/sdk@e1a2886f56 10.0.100-preview.1.25106.28 (#9762)
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]>
1 parent 4b28c3e commit 6ec531d

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs

+7-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ async Task<bool> DownloadDotNetInstallScript (Context context, string dotnetScri
8585
Log.StatusLine ("Downloading dotnet-install script...");
8686

8787
if (File.Exists (dotnetScriptPath)) {
88-
Log.WarningLine ($"Using cached installation script found in '{dotnetScriptPath}'");
88+
if (!bool.TryParse (Environment.GetEnvironmentVariable ("RunningOnCI"), out var ci) || !ci) {
89+
Log.WarningLine ($"Using cached installation script found in '{dotnetScriptPath}'");
90+
}
8991
return true;
9092
}
9193

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

144146
string[] GetInstallationScriptArgs (string version, string dotnetPath, string dotnetScriptPath, bool onlyGetUrls, bool runtimeOnly)
145147
{
148+
const string feed = "https://ci.dot.net/public";
149+
146150
List<string> args;
147151
if (Context.IsWindows) {
148152
args = new List<string> {
149153
"-NoProfile", "-ExecutionPolicy", "unrestricted", "-file", dotnetScriptPath,
150-
"-Version", version, "-InstallDir", dotnetPath, "-Verbose"
154+
"-Version", version, "-InstallDir", dotnetPath, "-AzureFeed", feed, "-Verbose"
151155
};
152156
if (runtimeOnly) {
153157
args.AddRange (new string [] { "-Runtime", "dotnet" });
@@ -160,7 +164,7 @@ string[] GetInstallationScriptArgs (string version, string dotnetPath, string do
160164
}
161165

162166
args = new List<string> {
163-
dotnetScriptPath, "--version", version, "--install-dir", dotnetPath, "--verbose"
167+
dotnetScriptPath, "--version", version, "--install-dir", dotnetPath, "--azure-feed", feed, "--verbose",
164168
};
165169

166170
if (runtimeOnly) {

eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.1.25104.22">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.1.25106.28">
44
<Uri>https://github.com/dotnet/sdk</Uri>
5-
<Sha>18f7c61557bd4f9e2fabb5c550dc00b9a9a596d5</Sha>
5+
<Sha>e1a2886f5628dfdf192225870a62a1d029da68fb</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.1.25080.5" CoherentParentDependency="Microsoft.NET.Sdk">
88
<Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25104.22</MicrosoftNETSdkPackageVersion>
4+
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25106.28</MicrosoftNETSdkPackageVersion>
55
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
66
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETILLinkTasksPackageVersion>
77
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETCoreAppRefPackageVersion>

0 commit comments

Comments
 (0)