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
6 changes: 3 additions & 3 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26070.123">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>7adb846f5b478a00c56a1e5a6401510606584057</Sha>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26062.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9f518f2be968c4c0102c2e3f8c793c5b7f28b731</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/PSScriptAnalyzerSettings.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
'PSStandardDSCFunctionsInResource',
'PSUseIdenticalMandatoryParametersForDSC',
'PSUseIdenticalParametersForDSC')
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ steps:
storageAccount: dotnetbuilds
container: internal
permissions: rl
is1ESPipeline: ${{ parameters.is1ESPipeline }}
is1ESPipeline: ${{ parameters.is1ESPipeline }}
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ steps:
exit 1
}
Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value"
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ steps:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
${{ each parameter in parameters.args }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/retain-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ steps:
displayName: Enable permanent build retention
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
BUILD_ID: $(Build.BuildId)
BUILD_ID: $(Build.BuildId)
2 changes: 1 addition & 1 deletion eng/common/core-templates/variables/pool-providers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ variables:
- ${{ if eq(parameters.is1ESPipeline, 'true') }}:
- template: /eng/common/templates-official/variables/pool-providers.yml
- ${{ else }}:
- template: /eng/common/templates/variables/pool-providers.yml
- template: /eng/common/templates/variables/pool-providers.yml
2 changes: 1 addition & 1 deletion eng/common/darc-init.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ catch {
Write-Host $_.ScriptStackTrace
Write-PipelineTelemetryError -Category 'Darc' -Message $_
ExitWithExitCode 1
}
}
2 changes: 1 addition & 1 deletion eng/common/dotnet-install.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet-install.ps1""" %*"
2 changes: 1 addition & 1 deletion eng/common/init-tools-native.cmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@echo off
powershell -NoProfile -NoLogo -ExecutionPolicy ByPass -command "& """%~dp0init-tools-native.ps1""" %*"
exit /b %ErrorLevel%
exit /b %ErrorLevel%
2 changes: 1 addition & 1 deletion eng/common/loc/P22DotNetHtmlLocalization.lss
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
</optionSet>
</optionSet>
</optionSet>
</LS_SETTINGS_FILE>
</LS_SETTINGS_FILE>
2 changes: 1 addition & 1 deletion eng/common/msbuild.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ catch {
ExitWithExitCode 1
}

ExitWithExitCode 0
ExitWithExitCode 0
2 changes: 1 addition & 1 deletion eng/common/sdl/NuGet.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdl/sdl.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ function Install-Gdn {
}

return $gdnCliPath.FullName
}
}
2 changes: 1 addition & 1 deletion eng/common/templates-official/jobs/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ jobs:
is1ESPipeline: true

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ variables:
is1ESPipeline: true

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ steps:
is1ESPipeline: true

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ steps:
is1ESPipeline: true

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ steps:
is1ESPipeline: true

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
2 changes: 1 addition & 1 deletion eng/common/templates-official/variables/pool-providers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ variables:
False,
'NetCore1ESPool-Internal'
)
]
]
2 changes: 1 addition & 1 deletion eng/common/templates-official/variables/sdl-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ variables:
- name: DefaultGuardianVersion
value: 0.109.0
- name: GuardianPackagesConfigFile
value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config
value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config
2 changes: 1 addition & 1 deletion eng/common/templates/jobs/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ jobs:
is1ESPipeline: false

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
2 changes: 1 addition & 1 deletion eng/common/templates/post-build/common-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ variables:
is1ESPipeline: false

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
2 changes: 1 addition & 1 deletion eng/common/templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ stages:
is1ESPipeline: false

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
2 changes: 1 addition & 1 deletion eng/common/templates/post-build/setup-maestro-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ steps:
is1ESPipeline: false

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
2 changes: 1 addition & 1 deletion eng/common/templates/steps/enable-internal-sources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ steps:
is1ESPipeline: false

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
2 changes: 1 addition & 1 deletion eng/common/templates/steps/get-federated-access-token.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ steps:
is1ESPipeline: false

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
2 changes: 1 addition & 1 deletion eng/common/templates/steps/publish-pipeline-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ steps:
${{ if parameters.args.parallelCount }}:
parallelCount: ${{ parameters.args.parallelCount }}
${{ if parameters.args.properties }}:
properties: ${{ parameters.args.properties }}
properties: ${{ parameters.args.properties }}
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.123",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26062.3",
"Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174"
}
}