зеркало из https://github.com/dotnet/razor.git
[main] Update dependencies from dotnet/arcade (#9936)
This commit is contained in:
Коммит
157216f748
|
@ -96,14 +96,14 @@
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
|
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24081.5">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24113.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>be88b08c41971b52ec11aec05ef31e72185d4a1f</Sha>
|
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<!-- Intermediate is necessary for source build. -->
|
<!-- Intermediate is necessary for source build. -->
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24081.5">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24113.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>be88b08c41971b52ec11aec05ef31e72185d4a1f</Sha>
|
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.10.0-2.24112.8</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
|
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.10.0-2.24112.8</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
|
||||||
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.10.0-2.24112.8</MicrosoftSourceBuildIntermediateroslynPackageVersion>
|
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.10.0-2.24112.8</MicrosoftSourceBuildIntermediateroslynPackageVersion>
|
||||||
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.10.0-2.24112.8</MicrosoftVisualStudioLanguageServicesPackageVersion>
|
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.10.0-2.24112.8</MicrosoftVisualStudioLanguageServicesPackageVersion>
|
||||||
<MicrosoftSourceBuildIntermediatearcadePackageVersion>8.0.0-beta.24081.5</MicrosoftSourceBuildIntermediatearcadePackageVersion>
|
<MicrosoftSourceBuildIntermediatearcadePackageVersion>8.0.0-beta.24113.2</MicrosoftSourceBuildIntermediatearcadePackageVersion>
|
||||||
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
|
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
|
||||||
<MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
|
<MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
|
||||||
<!--
|
<!--
|
||||||
|
|
|
@ -12,7 +12,7 @@ param(
|
||||||
try {
|
try {
|
||||||
. $PSScriptRoot\post-build-utils.ps1
|
. $PSScriptRoot\post-build-utils.ps1
|
||||||
|
|
||||||
$darc = Get-Darc
|
$darc = Get-Darc
|
||||||
|
|
||||||
$optionalParams = [System.Collections.ArrayList]::new()
|
$optionalParams = [System.Collections.ArrayList]::new()
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ try {
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host 'done.'
|
Write-Host 'done.'
|
||||||
}
|
}
|
||||||
catch {
|
catch {
|
||||||
Write-Host $_
|
Write-Host $_
|
||||||
Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
|
Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
|
||||||
|
|
|
@ -58,7 +58,7 @@ jobs:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||||
name: $(DncEngInternalBuildPool)
|
name: NetCore1ESPool-Publishing-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
@ -71,7 +71,7 @@ jobs:
|
||||||
checkDownloadedFiles: true
|
checkDownloadedFiles: true
|
||||||
condition: ${{ parameters.condition }}
|
condition: ${{ parameters.condition }}
|
||||||
continueOnError: ${{ parameters.continueOnError }}
|
continueOnError: ${{ parameters.continueOnError }}
|
||||||
|
|
||||||
- task: NuGetAuthenticate@1
|
- task: NuGetAuthenticate@1
|
||||||
|
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
|
@ -86,7 +86,7 @@ jobs:
|
||||||
/p:OfficialBuildId=$(Build.BuildNumber)
|
/p:OfficialBuildId=$(Build.BuildNumber)
|
||||||
condition: ${{ parameters.condition }}
|
condition: ${{ parameters.condition }}
|
||||||
continueOnError: ${{ parameters.continueOnError }}
|
continueOnError: ${{ parameters.continueOnError }}
|
||||||
|
|
||||||
- task: powershell@2
|
- task: powershell@2
|
||||||
displayName: Create ReleaseConfigs Artifact
|
displayName: Create ReleaseConfigs Artifact
|
||||||
inputs:
|
inputs:
|
||||||
|
@ -95,7 +95,7 @@ jobs:
|
||||||
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
|
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
|
||||||
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
|
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
|
||||||
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
|
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
|
||||||
|
|
||||||
- task: PublishBuildArtifacts@1
|
- task: PublishBuildArtifacts@1
|
||||||
displayName: Publish ReleaseConfigs Artifact
|
displayName: Publish ReleaseConfigs Artifact
|
||||||
inputs:
|
inputs:
|
||||||
|
@ -121,7 +121,7 @@ jobs:
|
||||||
|
|
||||||
- task: PublishBuildArtifacts@1
|
- task: PublishBuildArtifacts@1
|
||||||
displayName: Publish SymbolPublishingExclusionsFile Artifact
|
displayName: Publish SymbolPublishingExclusionsFile Artifact
|
||||||
condition: eq(variables['SymbolExclusionFile'], 'true')
|
condition: eq(variables['SymbolExclusionFile'], 'true')
|
||||||
inputs:
|
inputs:
|
||||||
PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
|
PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
|
||||||
PublishLocation: Container
|
PublishLocation: Container
|
||||||
|
@ -137,7 +137,7 @@ jobs:
|
||||||
displayName: Publish Using Darc
|
displayName: Publish Using Darc
|
||||||
inputs:
|
inputs:
|
||||||
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
|
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
|
||||||
arguments: -BuildId $(BARBuildId)
|
arguments: -BuildId $(BARBuildId)
|
||||||
-PublishingInfraVersion 3
|
-PublishingInfraVersion 3
|
||||||
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
|
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
|
||||||
-MaestroToken '$(MaestroApiAccessToken)'
|
-MaestroToken '$(MaestroApiAccessToken)'
|
||||||
|
@ -148,4 +148,4 @@ jobs:
|
||||||
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
|
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
|
||||||
- template: /eng/common/templates/steps/publish-logs.yml
|
- template: /eng/common/templates/steps/publish-logs.yml
|
||||||
parameters:
|
parameters:
|
||||||
JobLabel: 'Publish_Artifacts_Logs'
|
JobLabel: 'Publish_Artifacts_Logs'
|
||||||
|
|
|
@ -39,7 +39,7 @@ parameters:
|
||||||
displayName: Enable NuGet validation
|
displayName: Enable NuGet validation
|
||||||
type: boolean
|
type: boolean
|
||||||
default: true
|
default: true
|
||||||
|
|
||||||
- name: publishInstallersAndChecksums
|
- name: publishInstallersAndChecksums
|
||||||
displayName: Publish installers and checksums
|
displayName: Publish installers and checksums
|
||||||
type: boolean
|
type: boolean
|
||||||
|
@ -131,8 +131,8 @@ stages:
|
||||||
displayName: Validate
|
displayName: Validate
|
||||||
inputs:
|
inputs:
|
||||||
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
|
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
|
||||||
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
|
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
|
||||||
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
|
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
displayName: Signing Validation
|
displayName: Signing Validation
|
||||||
|
@ -221,9 +221,9 @@ stages:
|
||||||
displayName: Validate
|
displayName: Validate
|
||||||
inputs:
|
inputs:
|
||||||
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
|
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
|
||||||
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
|
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
|
||||||
-ExtractPath $(Agent.BuildDirectory)/Extract/
|
-ExtractPath $(Agent.BuildDirectory)/Extract/
|
||||||
-GHRepoName $(Build.Repository.Name)
|
-GHRepoName $(Build.Repository.Name)
|
||||||
-GHCommit $(Build.SourceVersion)
|
-GHCommit $(Build.SourceVersion)
|
||||||
-SourcelinkCliVersion $(SourceLinkCLIVersion)
|
-SourcelinkCliVersion $(SourceLinkCLIVersion)
|
||||||
continueOnError: true
|
continueOnError: true
|
||||||
|
@ -258,7 +258,7 @@ stages:
|
||||||
demands: Cmd
|
demands: Cmd
|
||||||
# If it's not devdiv, it's dnceng
|
# If it's not devdiv, it's dnceng
|
||||||
${{ else }}:
|
${{ else }}:
|
||||||
name: $(DncEngInternalBuildPool)
|
name: NetCore1ESPool-Publishing-Internal
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2019.amd64
|
||||||
steps:
|
steps:
|
||||||
- template: setup-maestro-vars.yml
|
- template: setup-maestro-vars.yml
|
||||||
|
@ -272,7 +272,7 @@ stages:
|
||||||
displayName: Publish Using Darc
|
displayName: Publish Using Darc
|
||||||
inputs:
|
inputs:
|
||||||
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
|
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
|
||||||
arguments: -BuildId $(BARBuildId)
|
arguments: -BuildId $(BARBuildId)
|
||||||
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
|
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
|
||||||
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
|
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
|
||||||
-MaestroToken '$(MaestroApiAccessToken)'
|
-MaestroToken '$(MaestroApiAccessToken)'
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool,
|
# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool,
|
||||||
# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches.
|
# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches.
|
||||||
|
|
||||||
# Motivation:
|
# Motivation:
|
||||||
# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS
|
# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS
|
||||||
# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing
|
# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing
|
||||||
# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS.
|
# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS.
|
||||||
# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services
|
# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services
|
||||||
# team needs to move resources around and create new and potentially differently-named pools. Using this template
|
# team needs to move resources around and create new and potentially differently-named pools. Using this template
|
||||||
# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming.
|
# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming.
|
||||||
|
|
||||||
# How to use:
|
# How to use:
|
||||||
# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do).
|
# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do).
|
||||||
# If we find alternate naming conventions in broad usage it can be added to the condition below.
|
# If we find alternate naming conventions in broad usage it can be added to the condition below.
|
||||||
#
|
#
|
||||||
|
@ -54,4 +54,4 @@ variables:
|
||||||
False,
|
False,
|
||||||
'NetCore1ESPool-Internal'
|
'NetCore1ESPool-Internal'
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
"rollForward": "latestPatch"
|
"rollForward": "latestPatch"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24081.5",
|
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2",
|
||||||
"Microsoft.Build.NoTargets": "2.0.1"
|
"Microsoft.Build.NoTargets": "2.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче