Skip to content

fix: typo donet -> dotnet #20122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 1 commit into from
Aug 29, 2023
Merged

fix: typo donet -> dotnet #20122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ $script:Options = $null
$dotnetMetadata = Get-Content $PSScriptRoot/DotnetRuntimeMetadata.json | ConvertFrom-Json
$dotnetCLIChannel = $dotnetMetadata.Sdk.Channel
$dotnetCLIQuality = $dotnetMetadata.Sdk.Quality
$dotnetAzureFeed = if (-not $env:__DONET_RUNTIME_FEED ) { $dotnetMetadata.Sdk.azureFeed }
$dotnetAzureFeedSecret = $env:__DONET_RUNTIME_FEED_KEY
$dotnetAzureFeed = if (-not $env:__DOTNET_RUNTIME_FEED ) { $dotnetMetadata.Sdk.azureFeed }
$dotnetAzureFeedSecret = $env:__DOTNET_RUNTIME_FEED_KEY
Comment on lines +22 to +23
Copy link
Contributor

@dkaszews dkaszews Aug 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are those env variables internal-only? Could this change possibly break workflow of someone who used the mistyped variables?

Copy link
Contributor Author

@0o001 0o001 Aug 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on what I've observed, they seem to be internal-only, but it might be prudent for others to conduct a review.

$dotnetSDKVersionOveride = $dotnetMetadata.Sdk.sdkImageOverride
$dotnetCLIRequiredVersion = $(Get-Content $PSScriptRoot/global.json | ConvertFrom-Json).Sdk.Version

Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
retryCountOnTaskFailure: 2
displayName: 'Bootstrap'
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
Import-Module .\build.psm1 -force
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ jobs:
condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
workingDirectory: $(PowerShellRoot)
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- powershell: |
try {
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ jobs:
condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
workingDirectory: $(PowerShellRoot)
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
try {
Expand Down
8 changes: 4 additions & 4 deletions tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ jobs:
}
displayName: 'Bootstrap VM'
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
# Add -SkipReleaseChecks as a mitigation to unblock release.
Expand All @@ -133,8 +133,8 @@ jobs:
}
displayName: 'Package'
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
displayName: 'Component Detection'
Expand Down
8 changes: 4 additions & 4 deletions tools/releaseBuild/azureDevOps/templates/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap
displayName: 'Bootstrap VM'
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
parameters:
Expand All @@ -58,8 +58,8 @@ jobs:
$env:AzDevOpsFeedPAT2 = $null
displayName: 'Build'
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
displayName: 'Component Detection'
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ jobs:
Start-PSBootStrap -Verbose
displayName: Bootstrap
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- task: DownloadBuildArtifacts@0
displayName: 'Download PowerShell build artifacts - finalResults'
Expand Down
12 changes: 6 additions & 6 deletions tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:

displayName: Install .NET
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
$branch = $ENV:BUILD_SOURCEBRANCH
Expand All @@ -85,8 +85,8 @@ jobs:

displayName: Install global tool
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
$toolPath = "$(System.DefaultWorkingDirectory)/toolPath/${{ parameters.globalToolExeName }}"
Expand Down Expand Up @@ -148,5 +148,5 @@ jobs:
}
displayName: Basic validation
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
8 changes: 4 additions & 4 deletions tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ jobs:

displayName: Install .NET
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
Expand Down Expand Up @@ -136,8 +136,8 @@ jobs:

displayName: Restore and execute tests
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- task: PublishTestResults@2
displayName: 'Publish Test Results **\test-hosting.xml'
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/release-ValidateFxdPackage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
Write-Verbose -Message "Installing .NET SDK completed." -Verbose
displayName: Install .NET
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
Get-ChildItem -Path '$(Pipeline.Workspace)/releasePipeline/finalResults' -Recurse
Expand Down
8 changes: 4 additions & 4 deletions tools/releaseBuild/azureDevOps/templates/testartifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
Start-PSBootstrap
displayName: Bootstrap
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
Import-Module ./build.psm1
Expand Down Expand Up @@ -86,8 +86,8 @@ jobs:
Start-PSBootstrap
displayName: Bootstrap
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
Import-Module ./build.psm1
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ jobs:
tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 -location '$(PowerShellRoot)' -destination '$(Build.ArtifactStagingDirectory)/Symbols_$(Architecture)' -Runtime $runtime -ReleaseTag '$(ReleaseTagVar)' -Symbols @params
displayName: 'Build Windows Universal - $(Architecture)-$(BuildConfiguration) Symbols zip'
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
$packageName = (Get-ChildItem '$(Build.ArtifactStagingDirectory)\Symbols_$(Architecture)').FullName
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ jobs:
$(PowerShellRoot)/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/PowerShellPackage.ps1 -BuildZip $signedPkg -location '$(PowerShellRoot)' -destination '$(System.ArtifactsDirectory)\pkgSigned' -Runtime $runtime -ReleaseTag '$(ReleaseTagVar)' @params
displayName: 'Build Windows Universal - $(Architecture) Package'
env:
__DONET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DONET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)
__DOTNET_RUNTIME_FEED: $(RUNTIME_SOURCEFEED)
__DOTNET_RUNTIME_FEED_KEY: $(RUNTIME_SOURCEFEED_KEY)

- pwsh: |
Get-ChildItem '$(System.ArtifactsDirectory)\pkgSigned' | ForEach-Object {
Expand Down