Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d397ab6
Update dependencies
dotnet-maestro[bot] Jan 6, 2026
171f9c6
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
DonnaChen888 Jan 7, 2026
8589691
Add back dotnet nuget sources
dsplaisted Jan 7, 2026
68d6c59
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
DonnaChen888 Jan 8, 2026
556e880
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
DonnaChen888 Jan 9, 2026
f912bec
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
DonnaChen888 Jan 9, 2026
6907275
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
DonnaChen888 Jan 9, 2026
862e1a5
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
DonnaChen888 Jan 9, 2026
9de4a7e
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
SimonZhao888 Jan 12, 2026
aee9757
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
SimonZhao888 Jan 13, 2026
aa93746
add missing details from the package spec
nkolev92 Jan 13, 2026
e492b78
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
SimonZhao888 Jan 14, 2026
63fd540
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
SimonZhao888 Jan 15, 2026
fecd008
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
SimonZhao888 Jan 15, 2026
1c5a8eb
add part of the package spec
nkolev92 Jan 15, 2026
3cf42fc
cleanup
nkolev92 Jan 15, 2026
650ba8b
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
SimonZhao888 Jan 16, 2026
4857456
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-9a6e3592-6…
SimonZhao888 Jan 16, 2026
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
254 changes: 121 additions & 133 deletions eng/Version.Details.props

Large diffs are not rendered by default.

376 changes: 192 additions & 184 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eng/common/internal-feed-operations.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function SetupCredProvider {
$url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'

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

Write-Host 'Installing plugin...'
.\installcredprovider.ps1 -Force
Expand Down
2 changes: 1 addition & 1 deletion eng/common/post-build/nuget-verification.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if ($NuGetExePath) {
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
$ProgressPreference = 'SilentlyContinue'
try {
Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
$ProgressPreference = 'Continue'
} catch {
$ProgressPreference = 'Continue'
Expand Down
6 changes: 3 additions & 3 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {

Retry({
Write-Host "GET $uri"
Invoke-WebRequest $uri -OutFile $installScript
Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript
})
}

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

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

Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
},
"tools": {
"dotnet": "10.0.100",
"dotnet": "10.0.101",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCorePlatformsPackageVersion)"
Expand All @@ -21,8 +21,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.3",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25605.3",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26055.110",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26055.110",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@ public void It_does_not_error_on_duplicate_package_names()
`net5.0`: {
`targetAlias`: `net5.0`
}
},
`restore`: {
`frameworks`: {
`net5.0`: {
`targetAlias`: `net5.0`
}
}
}
}
}".Replace('`', '"');
Expand Down Expand Up @@ -139,6 +146,13 @@ private static string AssetsFileWithInvalidLocale(string tfm, string locale) =>
`{tfm}`: {
`targetAlias`: `{tfm}`
}
},
`restore`: {
`frameworks`: {
`{tfm}`: {
`targetAlias`: `{tfm}`
}
}
}
}
}".Replace("`", "\"").Replace("{tfm}", tfm).Replace("{locale}", locale);
Expand Down
Loading