Skip to content

Commit 2edc460

Browse files
rolfbjarnerolfbjarne
committed
Merge remote-tracking branch 'origin/net11.0' into dev/rolf/bump-main-in-net11.0-2025-12-15
2 parents 5672c5b + b8f5f71 commit 2edc460

File tree

6 files changed

+48
-41
lines changed

6 files changed

+48
-41
lines changed

‎eng/Version.Details.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25611.103</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25611.103</MicrosoftDotNetBuildTasksFeedPackageVersion>
11-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25611.103</MicrosoftDotNetCecilPackageVersion>
12-
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25611.103</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
13-
<MicrosoftNETILLinkPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftNETILLinkPackageVersion>
14-
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftNETILLinkTasksPackageVersion>
15-
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16-
<MicrosoftNETSdkPackageVersion>11.0.100-alpha.1.25611.103</MicrosoftNETSdkPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.25611.103</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.25611.103</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25616.107</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25616.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
11+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25616.107</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25616.107</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
13+
<MicrosoftNETILLinkPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETILLinkPackageVersion>
14+
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETILLinkTasksPackageVersion>
15+
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16+
<MicrosoftNETSdkPackageVersion>11.0.100-alpha.1.25616.107</MicrosoftNETSdkPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.25616.107</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.25616.107</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
1919
<!-- dotnet/macios dependencies -->
2020
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
2121
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.11017</MicrosoftMacCatalystSdknet100_260PackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-alpha.1.25611.103">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-alpha.1.25616.107">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
5+
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.25611.103">
7+
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-alpha.1.25616.107">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
9+
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-alpha.1.25611.103">
11+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-alpha.1.25616.107">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
13+
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-alpha.1.25611.103">
15+
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-alpha.1.25616.107">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
17+
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
1818
</Dependency>
1919
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.25611.103">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.25616.107">
2121
<Uri>https://github.com/dotnet/dotnet</Uri>
22-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
22+
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25611.103">
24+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25616.107">
2525
<Uri>https://github.com/dotnet/dotnet</Uri>
26-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
26+
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
2727
</Dependency>
2828
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
2929
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
@@ -44,25 +44,25 @@
4444
</Dependency>
4545
</ProductDependencies>
4646
<ToolsetDependencies>
47-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25611.103">
47+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25616.107">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
49+
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
5050
</Dependency>
51-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25611.103">
51+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25616.107">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
53+
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25611.103">
55+
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25616.107">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
57+
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
5858
</Dependency>
5959
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25516.4">
6060
<Uri>https://github.com/dotnet/xharness</Uri>
6161
<Sha>88399512021dfa8b5f45d91f84c8ce6f0959b127</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25611.103">
63+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25616.107">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>a137035987f8faebec182016349982241a2eebd1</Sha>
65+
<Sha>5059bb6c1e9449762ef058ada17e2ddbbff2ac67</Sha>
6666
<SourceBuild RepoName="arcade" ManagedOnly="true" />
6767
</Dependency>
6868
</ToolsetDependencies>

‎eng/common/internal-feed-operations.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function SetupCredProvider {
2626
$url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'
2727

2828
Write-Host "Writing the contents of 'installcredprovider.ps1' locally..."
29-
Invoke-WebRequest $url -OutFile installcredprovider.ps1
29+
Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1
3030

3131
Write-Host 'Installing plugin...'
3232
.\installcredprovider.ps1 -Force

‎eng/common/post-build/nuget-verification.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ if ($NuGetExePath) {
6565
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
6666
$ProgressPreference = 'SilentlyContinue'
6767
try {
68-
Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
68+
Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
6969
$ProgressPreference = 'Continue'
7070
} catch {
7171
$ProgressPreference = 'Continue'

‎eng/common/tools.ps1‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
273273

274274
Retry({
275275
Write-Host "GET $uri"
276-
Invoke-WebRequest $uri -OutFile $installScript
276+
Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript
277277
})
278278
}
279279

@@ -506,7 +506,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
506506
Write-Host "Downloading $packageName $packageVersion"
507507
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
508508
Retry({
509-
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
509+
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath
510510
})
511511

512512
if (!(Test-Path $packagePath)) {
@@ -552,23 +552,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){
552552
Write-Host "Downloading vswhere $vswhereVersion"
553553
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
554554
Retry({
555-
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
555+
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe
556556
})
557557
}
558558

559-
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
559+
if (!$vsRequirements) {
560+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
561+
$vsRequirements = $GlobalJson.tools.vs
562+
} else {
563+
$vsRequirements = $null
564+
}
565+
}
566+
560567
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
561568

562569
if (!$excludePrereleaseVS) {
563570
$args += '-prerelease'
564571
}
565572

566-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
573+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
567574
$args += '-version'
568575
$args += $vsRequirements.version
569576
}
570577

571-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
578+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
572579
foreach ($component in $vsRequirements.components) {
573580
$args += '-requires'
574581
$args += $component

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "11.0.100-alpha.1.25611.103",
3+
"version": "11.0.100-alpha.1.25616.107",
44
"paths": [
55
"builds/downloads/dotnet",
66
"$host$"
77
],
88
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
99
},
1010
"tools": {
11-
"dotnet": "11.0.100-alpha.1.25611.103"
11+
"dotnet": "11.0.100-alpha.1.25616.107"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25611.103"
14+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25616.107"
1515
}
1616
}

0 commit comments

Comments
 (0)