Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"rollForward": false
},
"dotnet-coverage": {
"version": "18.8.0",
"version": "18.9.0",
"commands": [
"dotnet-coverage"
],
"rollForward": false
},
"nbgv": {
"version": "3.10.85",
"version": "3.10.91",
"commands": [
"nbgv"
],
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<MicrosoftTestingPlatformVersion>2.3.0</MicrosoftTestingPlatformVersion>
<MicrosoftTestingPlatformVersion>2.3.2</MicrosoftTestingPlatformVersion>
<MicroBuildVersion>2.0.226</MicroBuildVersion>
<CodeAnalysisVersion>5.6.0</CodeAnalysisVersion>
<CodefixTestingVersion>1.1.4</CodefixTestingVersion>
Expand All @@ -14,16 +14,16 @@
<PackageVersion Include="MessagePack" Version="2.5.302" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.8" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="$(CodefixTestingVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" Version="$(CodefixTestingVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
<PackageVersion Include="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.722401" />
<PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="4.0.722401" />
<PackageVersion Include="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.732401" />
<PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="4.0.732401" />
<PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.14.40260" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.14.40264" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="17.14.40264" />
Expand Down Expand Up @@ -57,7 +57,7 @@
<GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
<GlobalPackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" />
<!-- The condition works around https://github.com/dotnet/sdk/issues/44951 -->
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.10.85" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.10.91" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
<GlobalPackageReference Include="PolySharp" Version="1.16.0" />
<GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.301",
"version": "10.0.302",
"rollForward": "patch",
"allowPrerelease": false
},
Expand Down
4 changes: 2 additions & 2 deletions tools/GitHubActions.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function Add-GitHubActionsEnvVariable {
)

if ([string]::IsNullOrWhiteSpace($Path)) {
throw "GitHub Actions environment file path must not be empty."
throw "GitHub Actions GITHUB_ENV file path must not be empty."
}

if ([string]::IsNullOrWhiteSpace($Name)) {
Expand All @@ -29,7 +29,7 @@ function Add-GitHubActionsPath {
)

if ([string]::IsNullOrWhiteSpace($Path)) {
throw "GitHub Actions path file path must not be empty."
throw "GitHub Actions GITHUB_PATH file path must not be empty."
}

if ([string]::IsNullOrWhiteSpace($Value)) {
Expand Down
13 changes: 5 additions & 8 deletions tools/Install-DotNetSdk.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -284,18 +284,15 @@ if ($IncludeX86) {
}

if ($IsMacOS -or $IsLinux) {
$DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/a3fbd0fd625032bac207f1f590e5353fe26faa59/src/dotnet-install.sh"
$DotNetInstallScriptPath = "$DotNetInstallScriptRoot/dotnet-install.sh"
$DotNetInstallScriptPath = "$PSScriptRoot/dotnet-install.sh"
} else {
$DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/a3fbd0fd625032bac207f1f590e5353fe26faa59/src/dotnet-install.ps1"
$DotNetInstallScriptPath = "$DotNetInstallScriptRoot/dotnet-install.ps1"
$DotNetInstallScriptPath = "$PSScriptRoot/dotnet-install.ps1"
}

# Verify the cached script exists
if (-not (Test-Path $DotNetInstallScriptPath)) {
Invoke-WebRequest -Uri $DownloadUri -OutFile $DotNetInstallScriptPath -UseBasicParsing
if ($IsMacOS -or $IsLinux) {
chmod +x $DotNetInstallScriptPath
}
Write-Error "Cached dotnet-install script not found at $DotNetInstallScriptPath. Run tools/Update-DotNetInstallScript.ps1 to download it."
exit 1
}

# In case the script we invoke is in a directory with spaces, wrap it with single quotes.
Expand Down
36 changes: 36 additions & 0 deletions tools/Update-DotNetInstallScript.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env pwsh

<#
.SYNOPSIS
Updates the cached dotnet-install scripts from the dotnet/install-scripts GitHub repository.
.DESCRIPTION
Downloads the latest dotnet-install.ps1 and dotnet-install.sh scripts from
https://github.com/dotnet/install-scripts and caches them locally to avoid GitHub API rate limiting.
Run this script periodically to get the latest installation scripts.
#>
[CmdletBinding(SupportsShouldProcess = $true)]
Param()

$ScriptRoot = Split-Path -Parent $MyInvocation.MyCommand.Path
$DownloadBaseUri = "https://raw.githubusercontent.com/dotnet/install-scripts/main/src"

$scripts = @('dotnet-install.ps1', 'dotnet-install.sh')

foreach ($script in $scripts) {
$Uri = "$DownloadBaseUri/$script"
$OutFile = Join-Path $ScriptRoot $script

Write-Host "Updating $script from GitHub..."
try {
if ($PSCmdlet.ShouldProcess($OutFile, "Update from $Uri")) {
Invoke-WebRequest -Uri $Uri -OutFile $OutFile -UseBasicParsing
Write-Host "✓ Successfully updated $script" -ForegroundColor Green
}
Comment thread
AArnott marked this conversation as resolved.
}
catch {
Write-Error "Failed to update ${script}: $_"
exit 1
}
}

Write-Host "All cached scripts have been updated." -ForegroundColor Green
Loading
Loading