diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 386478a4c10d1..05eaade4ca1b9 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.21227.1",
+ "version": "1.0.0-prerelease.21254.2",
"commands": [
"xharness"
]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0406faf55f03a..916824df58bb6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,74 +1,74 @@
-
+
https://github.com/dotnet/icu
- 1506ee5e15b24023af8dbe798b8529bd2ca599d6
+ 2b360359e8a3496d7c80a3bffb6a7b626d51f54c
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -94,121 +94,121 @@
https://github.com/microsoft/vstest
140434f7109d357d0158ade9e5164a4861513965
-
+
https://github.com/dotnet/runtime-assets
- 2d540b5877a2de3d774cef4a6934b6f628b4f69f
+ 15f1cd8ebde52c383c202732777fb20c2e743239
-
+
https://github.com/dotnet/runtime-assets
- 2d540b5877a2de3d774cef4a6934b6f628b4f69f
+ 15f1cd8ebde52c383c202732777fb20c2e743239
-
+
https://github.com/dotnet/runtime-assets
- 2d540b5877a2de3d774cef4a6934b6f628b4f69f
+ 15f1cd8ebde52c383c202732777fb20c2e743239
-
+
https://github.com/dotnet/runtime-assets
- 2d540b5877a2de3d774cef4a6934b6f628b4f69f
+ 15f1cd8ebde52c383c202732777fb20c2e743239
-
+
https://github.com/dotnet/runtime-assets
- 2d540b5877a2de3d774cef4a6934b6f628b4f69f
+ 15f1cd8ebde52c383c202732777fb20c2e743239
-
+
https://github.com/dotnet/runtime-assets
- 2d540b5877a2de3d774cef4a6934b6f628b4f69f
+ 15f1cd8ebde52c383c202732777fb20c2e743239
-
+
https://github.com/dotnet/runtime-assets
- 2d540b5877a2de3d774cef4a6934b6f628b4f69f
+ 15f1cd8ebde52c383c202732777fb20c2e743239
-
+
https://github.com/dotnet/runtime-assets
- 2d540b5877a2de3d774cef4a6934b6f628b4f69f
+ 15f1cd8ebde52c383c202732777fb20c2e743239
-
+
https://github.com/dotnet/runtime-assets
- 2d540b5877a2de3d774cef4a6934b6f628b4f69f
+ 15f1cd8ebde52c383c202732777fb20c2e743239
-
+
https://github.com/dotnet/llvm-project
- 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4
+ 324e6cfdeead35f665de6e0833b414c56a34a258
-
+
https://github.com/dotnet/llvm-project
- 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4
+ 324e6cfdeead35f665de6e0833b414c56a34a258
-
+
https://github.com/dotnet/llvm-project
- 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4
+ 324e6cfdeead35f665de6e0833b414c56a34a258
-
+
https://github.com/dotnet/llvm-project
- 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4
+ 324e6cfdeead35f665de6e0833b414c56a34a258
-
+
https://github.com/dotnet/llvm-project
- 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4
+ 324e6cfdeead35f665de6e0833b414c56a34a258
-
+
https://github.com/dotnet/llvm-project
- 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4
+ 324e6cfdeead35f665de6e0833b414c56a34a258
-
+
https://github.com/dotnet/llvm-project
- 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4
+ 324e6cfdeead35f665de6e0833b414c56a34a258
-
+
https://github.com/dotnet/llvm-project
- 0c3c9c4f963dd3fb02a9f20731154a2e11bd8db4
+ 324e6cfdeead35f665de6e0833b414c56a34a258
https://github.com/dotnet/runtime
38017c3935de95d0335bac04f4901ddfc2718656
-
+
https://github.com/dotnet/runtime
- 3782e6e41cfaf76ec9ae4117722f835596026b1a
+ e6bb456e608ad24a55f3fef2d1ee4ede07d6c729
-
+
https://github.com/dotnet/runtime
- 3782e6e41cfaf76ec9ae4117722f835596026b1a
+ e6bb456e608ad24a55f3fef2d1ee4ede07d6c729
-
+
https://github.com/dotnet/runtime
- 3782e6e41cfaf76ec9ae4117722f835596026b1a
+ e6bb456e608ad24a55f3fef2d1ee4ede07d6c729
-
+
https://github.com/dotnet/runtime
- 3782e6e41cfaf76ec9ae4117722f835596026b1a
+ e6bb456e608ad24a55f3fef2d1ee4ede07d6c729
-
+
https://github.com/dotnet/runtime
- 3782e6e41cfaf76ec9ae4117722f835596026b1a
+ e6bb456e608ad24a55f3fef2d1ee4ede07d6c729
-
+
https://github.com/dotnet/runtime
- 3782e6e41cfaf76ec9ae4117722f835596026b1a
+ e6bb456e608ad24a55f3fef2d1ee4ede07d6c729
-
+
https://github.com/dotnet/runtime
- 3782e6e41cfaf76ec9ae4117722f835596026b1a
+ e6bb456e608ad24a55f3fef2d1ee4ede07d6c729
https://github.com/mono/linker
1dfcf3077aca1ea77850f409d95c3192f03507b3
-
+
https://github.com/dotnet/xharness
- 0e95171622e7facccb7cf0a9e4340122b0357b61
+ 89cb4b1d368e0f15b4df8e02a176dd1f1c33958b
-
+
https://github.com/dotnet/xharness
- 0e95171622e7facccb7cf0a9e4340122b0357b61
+ 89cb4b1d368e0f15b4df8e02a176dd1f1c33958b
-
+
https://github.com/dotnet/arcade
- b7279bb45342c948ab46fea2d08ec17ae2f2a1bf
+ 0cfaf935894a4c98ff7445c903f1b4c32990b127
diff --git a/eng/Versions.props b/eng/Versions.props
index e823b627f86e1..49d02fbf45287 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -54,28 +54,28 @@
3.10.0-2.final
3.10.0-2.final
- 6.0.0-beta.21222.1
- 6.0.0-beta.21222.1
- 6.0.0-beta.21222.1
- 6.0.0-beta.21222.1
- 6.0.0-beta.21222.1
- 6.0.0-beta.21222.1
- 2.5.1-beta.21222.1
- 6.0.0-beta.21222.1
- 6.0.0-beta.21222.1
- 6.0.0-beta.21222.1
- 6.0.0-beta.21222.1
- 6.0.0-beta.21222.1
- 6.0.0-beta.21222.1
+ 6.0.0-beta.21254.3
+ 6.0.0-beta.21254.3
+ 6.0.0-beta.21254.3
+ 6.0.0-beta.21254.3
+ 6.0.0-beta.21254.3
+ 6.0.0-beta.21254.3
+ 2.5.1-beta.21254.3
+ 6.0.0-beta.21254.3
+ 6.0.0-beta.21254.3
+ 6.0.0-beta.21254.3
+ 6.0.0-beta.21254.3
+ 6.0.0-beta.21254.3
+ 6.0.0-beta.21254.3
5.9.0-preview.2
6.0.0-alpha.1.20612.4
- 6.0.0-preview.5.21226.1
- 6.0.0-preview.5.21226.1
+ 6.0.0-preview.5.21253.1
+ 6.0.0-preview.5.21253.1
3.1.0
- 6.0.0-preview.5.21226.1
+ 6.0.0-preview.5.21253.1
1.2.0-beta.304
4.5.1
@@ -103,24 +103,24 @@
4.7.0
4.7.0
4.7.0
- 6.0.0-preview.5.21226.1
- 6.0.0-preview.5.21226.1
+ 6.0.0-preview.5.21253.1
+ 6.0.0-preview.5.21253.1
4.3.0
4.5.4
4.5.0
1.1.1
4.3.0
- 6.0.0-preview.5.21226.1
+ 6.0.0-preview.5.21253.1
- 6.0.0-beta.21226.1
- 6.0.0-beta.21226.1
- 6.0.0-beta.21226.1
- 6.0.0-beta.21226.1
- 6.0.0-beta.21226.1
- 6.0.0-beta.21226.1
- 6.0.0-beta.21226.1
- 6.0.0-beta.21226.1
- 6.0.0-beta.21226.1
+ 6.0.0-beta.21230.1
+ 6.0.0-beta.21230.1
+ 6.0.0-beta.21230.1
+ 6.0.0-beta.21230.1
+ 6.0.0-beta.21230.1
+ 6.0.0-beta.21230.1
+ 6.0.0-beta.21230.1
+ 6.0.0-beta.21230.1
+ 6.0.0-beta.21230.1
99.99.99-master-20210415.12
99.99.99-master-20210415.12
@@ -153,8 +153,8 @@
1.0.1-prerelease-00006
16.9.0-preview-20201201-01
- 1.0.0-prerelease.21227.1
- 1.0.0-prerelease.21227.1
+ 1.0.0-prerelease.21254.2
+ 1.0.0-prerelease.21254.2
2.4.1
2.4.2
1.3.0
@@ -167,16 +167,16 @@
6.0.100-preview.2.21226.1
- 6.0.0-preview.5.21226.1
+ 6.0.0-preview.5.21253.1
- 9.0.1-alpha.1.21226.1
- 9.0.1-alpha.1.21226.1
- 9.0.1-alpha.1.21226.1
- 9.0.1-alpha.1.21226.1
- 9.0.1-alpha.1.21226.1
- 9.0.1-alpha.1.21226.1
- 9.0.1-alpha.1.21226.1
- 9.0.1-alpha.1.21226.1
+ 9.0.1-alpha.1.21253.1
+ 9.0.1-alpha.1.21253.1
+ 9.0.1-alpha.1.21253.1
+ 9.0.1-alpha.1.21253.1
+ 9.0.1-alpha.1.21253.1
+ 9.0.1-alpha.1.21253.1
+ 9.0.1-alpha.1.21253.1
+ 9.0.1-alpha.1.21253.1
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 81e641a57b53d..df0dfa5781cde 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -78,6 +78,10 @@ __IllumosPackages+=" openssl-1.1.1e"
__IllumosPackages+=" zlib-1.2.11"
__IllumosPackages+=" openldap-client-2.4.49"
+# ML.NET dependencies
+__UbuntuPackages+=" libomp5"
+__UbuntuPackages+=" libomp-dev"
+
__UseMirror=0
__UnprocessedBuildArgs=
diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1
index 1c46f7b634148..8c554729b612d 100644
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@@ -14,7 +14,7 @@ param(
$global:RepoFiles = @{}
# Maximum number of jobs to run in parallel
-$MaxParallelJobs = 6
+$MaxParallelJobs = 16
# Wait time between check for system load
$SecondsBetweenLoadChecks = 10
diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1
index 99bf28cd5c1b5..788321d773d60 100644
--- a/eng/common/post-build/symbols-validation.ps1
+++ b/eng/common/post-build/symbols-validation.ps1
@@ -1,13 +1,14 @@
param(
- [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored
- [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation
- [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use
- [Parameter(Mandatory=$false)][switch] $ContinueOnError, # If we should keep checking symbols after an error
- [Parameter(Mandatory=$false)][switch] $Clean # Clean extracted symbols directory after checking symbols
+ [Parameter(Mandatory = $true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored
+ [Parameter(Mandatory = $true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation
+ [Parameter(Mandatory = $true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use
+ [Parameter(Mandatory = $false)][switch] $CheckForWindowsPdbs, # If we should check for the existence of windows pdbs in addition to portable PDBs
+ [Parameter(Mandatory = $false)][switch] $ContinueOnError, # If we should keep checking symbols after an error
+ [Parameter(Mandatory = $false)][switch] $Clean # Clean extracted symbols directory after checking symbols
)
# Maximum number of jobs to run in parallel
-$MaxParallelJobs = 6
+$MaxParallelJobs = 16
# Max number of retries
$MaxRetry = 5
@@ -19,9 +20,15 @@ $SecondsBetweenLoadChecks = 10
Set-Variable -Name "ERROR_BADEXTRACT" -Option Constant -Value -1
Set-Variable -Name "ERROR_FILEDOESNOTEXIST" -Option Constant -Value -2
+$WindowsPdbVerificationParam = ""
+if ($CheckForWindowsPdbs) {
+ $WindowsPdbVerificationParam = "--windows-pdbs"
+}
+
$CountMissingSymbols = {
param(
- [string] $PackagePath # Path to a NuGet package
+ [string] $PackagePath, # Path to a NuGet package
+ [string] $WindowsPdbVerificationParam # If we should check for the existence of windows pdbs in addition to portable PDBs
)
. $using:PSScriptRoot\..\tools.ps1
@@ -34,7 +41,7 @@ $CountMissingSymbols = {
if (!(Test-Path $PackagePath)) {
Write-PipelineTaskError "Input file does not exist: $PackagePath"
return [pscustomobject]@{
- result = $using:ERROR_FILEDOESNOTEXIST
+ result = $using:ERROR_FILEDOESNOTEXIST
packagePath = $PackagePath
}
}
@@ -57,24 +64,25 @@ $CountMissingSymbols = {
Write-Host "Something went wrong extracting $PackagePath"
Write-Host $_
return [pscustomobject]@{
- result = $using:ERROR_BADEXTRACT
+ result = $using:ERROR_BADEXTRACT
packagePath = $PackagePath
}
}
Get-ChildItem -Recurse $ExtractPath |
- Where-Object {$RelevantExtensions -contains $_.Extension} |
- ForEach-Object {
- $FileName = $_.FullName
- if ($FileName -Match '\\ref\\') {
- Write-Host "`t Ignoring reference assembly file " $FileName
- return
- }
+ Where-Object { $RelevantExtensions -contains $_.Extension } |
+ ForEach-Object {
+ $FileName = $_.FullName
+ if ($FileName -Match '\\ref\\') {
+ Write-Host "`t Ignoring reference assembly file " $FileName
+ return
+ }
- $FirstMatchingSymbolDescriptionOrDefault = {
+ $FirstMatchingSymbolDescriptionOrDefault = {
param(
- [string] $FullPath, # Full path to the module that has to be checked
- [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
+ [string] $FullPath, # Full path to the module that has to be checked
+ [string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
+ [string] $WindowsPdbVerificationParam, # Parameter to pass to potential check for windows-pdbs.
[string] $SymbolsPath
)
@@ -99,7 +107,7 @@ $CountMissingSymbols = {
# DWARF file for a .dylib
$DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf')
-
+
$dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools"
$dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe"
@@ -107,7 +115,7 @@ $CountMissingSymbols = {
while ($totalRetries -lt $using:MaxRetry) {
# Save the output and get diagnostic output
- $output = & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String
+ $output = & $dotnetSymbolExe --symbols --modules $WindowsPdbVerificationParam $TargetServerParam $FullPath -o $SymbolsPath --diagnostics | Out-String
if (Test-Path $PdbPath) {
return 'PDB'
@@ -136,30 +144,30 @@ $CountMissingSymbols = {
return $null
}
- $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath
- $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath
+ $SymbolsOnMSDL = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--microsoft-symbol-server' $SymbolsPath $WindowsPdbVerificationParam
+ $SymbolsOnSymWeb = & $FirstMatchingSymbolDescriptionOrDefault $FileName '--internal-server' $SymbolsPath $WindowsPdbVerificationParam
- Write-Host -NoNewLine "`t Checking file " $FileName "... "
+ Write-Host -NoNewLine "`t Checking file " $FileName "... "
- if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
- Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)"
+ if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
+ Write-Host "Symbols found on MSDL ($SymbolsOnMSDL) and SymWeb ($SymbolsOnSymWeb)"
+ }
+ else {
+ $MissingSymbols++
+
+ if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) {
+ Write-Host 'No symbols found on MSDL or SymWeb!'
}
else {
- $MissingSymbols++
-
- if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) {
- Write-Host 'No symbols found on MSDL or SymWeb!'
+ if ($SymbolsOnMSDL -eq $null) {
+ Write-Host 'No symbols found on MSDL!'
}
else {
- if ($SymbolsOnMSDL -eq $null) {
- Write-Host 'No symbols found on MSDL!'
- }
- else {
- Write-Host 'No symbols found on SymWeb!'
- }
+ Write-Host 'No symbols found on SymWeb!'
}
}
}
+ }
if ($using:Clean) {
Remove-Item $ExtractPath -Recurse -Force
@@ -168,16 +176,16 @@ $CountMissingSymbols = {
Pop-Location
return [pscustomobject]@{
- result = $MissingSymbols
- packagePath = $PackagePath
- }
+ result = $MissingSymbols
+ packagePath = $PackagePath
+ }
}
function CheckJobResult(
- $result,
- $packagePath,
- [ref]$DupedSymbols,
- [ref]$TotalFailures) {
+ $result,
+ $packagePath,
+ [ref]$DupedSymbols,
+ [ref]$TotalFailures) {
if ($result -eq $ERROR_BADEXTRACT) {
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "$packagePath has duplicated symbol files"
$DupedSymbols.Value++
@@ -222,7 +230,7 @@ function CheckSymbolsAvailable {
return
}
- Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null
+ Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList @($FullName,$WindowsPdbVerificationParam) | Out-Null
$NumJobs = @(Get-Job -State 'Running').Count
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index d2b271ec1ac13..958db4064cf02 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -12,11 +12,13 @@ parameters:
SourcesDirectory: $(Build.SourcesDirectory)
CreatePr: true
AutoCompletePr: false
+ UseLfLineEndings: true
UseCheckedInLocProjectJson: false
LanguageSet: VS_Main_Languages
LclSource: lclFilesInRepo
LclPackageId: ''
RepoType: gitHub
+ condition: ''
jobs:
- job: OneLocBuild
@@ -44,6 +46,7 @@ jobs:
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
arguments: $(_GenerateLocProjectArguments)
displayName: Generate LocProject.json
+ condition: ${{ parameters.condition }}
- task: OneLocBuild@2
displayName: OneLocBuild
@@ -57,12 +60,13 @@ jobs:
isCreatePrSelected: ${{ parameters.CreatePr }}
${{ if eq(parameters.CreatePr, true) }}:
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
+ isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
packageSourceAuth: patAuth
patVariable: ${{ parameters.CeapexPat }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
repoType: ${{ parameters.RepoType }}
gitHubPatVariable: "${{ parameters.GithubPat }}"
- condition: always()
+ condition: ${{ parameters.condition }}
- task: PublishBuildArtifacts@1
displayName: Publish Localization Files
@@ -70,7 +74,7 @@ jobs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc'
PublishLocation: Container
ArtifactName: Loc
- condition: always()
+ condition: ${{ parameters.condition }}
- task: PublishBuildArtifacts@1
displayName: Publish LocProject.json
@@ -78,4 +82,4 @@ jobs:
PathtoPublish: '$(Build.SourcesDirectory)/Localize/'
PublishLocation: Container
ArtifactName: Loc
- condition: always()
\ No newline at end of file
+ condition: ${{ parameters.condition }}
\ No newline at end of file
diff --git a/global.json b/global.json
index f1d09921257f3..4c3971716b75b 100644
--- a/global.json
+++ b/global.json
@@ -1,23 +1,23 @@
{
"sdk": {
- "version": "6.0.100-preview.2.21155.3",
+ "version": "6.0.100-preview.3.21202.5",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "6.0.100-preview.2.21155.3"
+ "dotnet": "6.0.100-preview.3.21202.5"
},
"native-tools": {
"cmake": "3.16.4",
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21222.1",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21222.1",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21222.1",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21254.3",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21254.3",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21254.3",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21254.3",
"Microsoft.Build.NoTargets": "2.0.17",
"Microsoft.Build.Traversal": "2.1.1",
- "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21226.1"
+ "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21253.1"
}
}