[main] Update dependencies from dotnet/arcade#6566

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
michaelgsharp merged 7 commits into from
May 5, 2023
Merged

[main] Update dependencies from dotnet/arcade #6566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a292c0e
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Feb 13, 2023
fc6419b
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Feb 15, 2023
1d205a5
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Feb 27, 2023
e01be7c
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Mar 15, 2023
166f506
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Apr 11, 2023
01676c5
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Apr 24, 2023
7501915
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] May 1, 2023
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
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,25 +7,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23073.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23073.6">
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23228.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23073.6">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23228.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand All@@ -39,9 +39,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23073.6">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@
<DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down
48 changes: 45 additions & 3 deletions eng/common/generate-locproject.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern

$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
if (-not $wxlFiles) {
$wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
if ($wxlEnFiles) {
$wxlFiles = @()
$wxlEnFiles | ForEach-Object {
$destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
$wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
}
}
}

$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
$macosHtmlFiles = @()
if ($macosHtmlEnFiles) {
$macosHtmlEnFiles | ForEach-Object {
$destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
$macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
}
}

$xlfFiles = @()

Expand DownExpand Up@@ -91,15 +110,15 @@ $locJson = @{
)
},
@{
LanguageSet = $LanguageSet
CloneLanguageSet = "WiX_CloneLanguages"
LssFiles = @( "wxl_loc.lss" )
LocItems = @(
$wxlFiles | ForEach-Object {
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($_.FullName.Contains($exclusion))
{
if ($_.FullName.Contains($exclusion)) {
$continue = $false
}
}
Expand All@@ -110,7 +129,30 @@ $locJson = @{
SourceFile = $sourceFile
CopyOption = "LangIDOnPath"
OutputPath = $outputPath
Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
}
}
}
)
},
@{
LanguageSet = $LanguageSet
CloneLanguageSet = "VS_macOS_CloneLanguages"
LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
LocItems = @(
$macosHtmlFiles | ForEach-Object {
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($_.FullName.Contains($exclusion)) {
$continue = $false
}
}
$sourceFile = ($_.FullName | Resolve-Path -Relative)
if ($continue) {
return @{
SourceFile = $sourceFile
CopyOption = "LangIDOnPath"
OutputPath = $outputPath
}
}
}
Expand Down
Binary file addedeng/common/loc/P22DotNetHtmlLocalization.lss
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion eng/common/native/init-compiler.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
# Set default versions
if [[ -z "$majorVersion" ]]; then
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi

for version in "${versions[@]}"; do
Expand Down
3 changes: 2 additions & 1 deletion eng/common/templates/job/execute-sdl.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,14 +46,15 @@ jobs:
- template: /eng/common/templates/variables/sdl-variables.yml
- name: GuardianVersion
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
- template: /eng/common/templates/variables/pool-providers.yml
pool:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- checkout: self
Expand Down
12 changes: 8 additions & 4 deletions eng/common/templates/job/job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ parameters:
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishUsingPipelines: false
disableComponentGovernance: false
disableComponentGovernance: ''
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
Expand DownExpand Up@@ -142,9 +142,13 @@ jobs:
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
continueOnError: true

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
- task: ComponentGovernanceComponentDetection@0
continueOnError: true
- template: /eng/common/templates/steps/component-governance.yml
parameters:
${{ if eq(parameters.disableComponentGovernance, '') }}:
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
disableComponentGovernance: false
${{ else }}:
disableComponentGovernance: true

- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down
43 changes: 23 additions & 20 deletions eng/common/templates/job/onelocbuild.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ parameters:
ReusePr: true
UseLfLineEndings: true
UseCheckedInLocProjectJson: false
SkipLocProjectJsonGeneration: false
LanguageSet: VS_Main_Languages
LclSource: lclFilesInRepo
LclPackageId: ''
Expand All@@ -22,13 +23,25 @@ parameters:
MirrorRepo: ''
MirrorBranch: main
condition: ''
JobNameSuffix: ''

jobs:
- job: OneLocBuild
- job: OneLocBuild${{ parameters.JobNameSuffix }}

dependsOn: ${{ parameters.dependsOn }}

displayName: OneLocBuild
displayName: OneLocBuild${{ parameters.JobNameSuffix }}

variables:
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
- name: _GenerateLocProjectArguments
value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
-LanguageSet "${{ parameters.LanguageSet }}"
-CreateNeutralXlfs
- ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
- name: _GenerateLocProjectArguments
value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
- template: /eng/common/templates/variables/pool-providers.yml

${{ if ne(parameters.pool, '') }}:
pool: ${{ parameters.pool }}
Expand All@@ -40,27 +53,17 @@ jobs:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64

variables:
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
- name: _GenerateLocProjectArguments
value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
-LanguageSet "${{ parameters.LanguageSet }}"
-CreateNeutralXlfs
- ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
- name: _GenerateLocProjectArguments
value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson


steps:
- task: Powershell@2
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
arguments: $(_GenerateLocProjectArguments)
displayName: Generate LocProject.json
condition: ${{ parameters.condition }}
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
- task: Powershell@2
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
arguments: $(_GenerateLocProjectArguments)
displayName: Generate LocProject.json
condition: ${{ parameters.condition }}

- task: OneLocBuild@2
displayName: OneLocBuild
Expand Down
14 changes: 12 additions & 2 deletions eng/common/templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,15 +34,15 @@ jobs:
- job: Asset_Registry_Publish

dependsOn: ${{ parameters.dependsOn }}
timeoutInMinutes: 150

${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
displayName: Publish Assets
${{ else }}:
displayName: Publish to Build Asset Registry

pool: ${{ parameters.pool }}

variables:
- template: /eng/common/templates/variables/pool-providers.yml
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: Publish-Build-Assets
- group: AzureDevOps-Artifact-Feeds-Pats
Expand All@@ -51,6 +51,16 @@ jobs:
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
- template: /eng/common/templates/post-build/common-variables.yml

pool:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64

steps:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: DownloadBuildArtifacts@0
Expand Down
7 changes: 5 additions & 2 deletions eng/common/templates/job/source-build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,16 @@ jobs:
${{ if eq(parameters.platform.pool, '') }}:
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
# source-build builds run in Docker, including the default managed platform.
# /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}

Expand Down
5 changes: 3 additions & 2 deletions eng/common/templates/job/source-index-stage1.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,17 @@ jobs:
value: ${{ parameters.binlogPath }}
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: source-dot-net stage1 variables
- template: /eng/common/templates/variables/pool-providers.yml

${{ if ne(parameters.pool, '') }}:
pool: ${{ parameters.pool }}
${{ if eq(parameters.pool, '') }}:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64

steps:
Expand Down
9 changes: 0 additions & 9 deletions eng/common/templates/jobs/jobs.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,15 +88,6 @@ jobs:
- ${{ job.job }}
- ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete
pool:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64

runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[main] Update dependencies from dotnet/arcade#6566

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

michaelgsharp
merged 7 commits into

from

May 5, 2023
 Merged


[main] Update dependencies from dotnet/arcade
#6566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
a292c0e

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 13, 2023
fc6419b

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 15, 2023
1d205a5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 27, 2023
e01be7c

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Mar 15, 2023
166f506

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 11, 2023
01676c5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 24, 2023
7501915

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] May 1, 2023

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


24 changes: 12 additions & 12 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,25 +7,25 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
 <Uri>https://github.com/dotnet/arcade-services</Uri>
Expand All@@ -39,9 +39,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
 <Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

48 changes: 45 additions & 3 deletions
eng/common/generate-locproject.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern

$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
if (-not $wxlFiles) {
 $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
 if ($wxlEnFiles) {
 $wxlFiles = @()
 $wxlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
 }
}

$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
$macosHtmlFiles = @()
if ($macosHtmlEnFiles) {
 $macosHtmlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
}

$xlfFiles = @()

Expand DownExpand Up@@ -91,15 +110,15 @@ $locJson = @{
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "WiX_CloneLanguages"
 LssFiles = @( "wxl_loc.lss" )
 LocItems = @(
 $wxlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion))
 {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
Expand All@@ -110,7 +129,30 @@ $locJson = @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
 }
 }
 }
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "VS_macOS_CloneLanguages"
 LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
 LocItems = @(
 $macosHtmlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
 $sourceFile = ($_.FullName | Resolve-Path -Relative)
 if ($continue) {
 return @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 }
 }
 }
Expand Down
Binary file addedeng/common/loc/P22DotNetHtmlLocalization.lss

View file


Open in desktop


Binary file not shown.


2 changes: 1 addition & 1 deletion
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
 # Set default versions
 if [[ -z "$majorVersion" ]]; then
 # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
 if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi

 for version in "${versions[@]}"; do
Expand Down

3 changes: 2 additions & 1 deletion
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,14 +46,15 @@ jobs:
 - template: /eng/common/templates/variables/sdl-variables.yml
 - name: GuardianVersion
 value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
 - template: /eng/common/templates/variables/pool-providers.yml
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64
 steps:
 - checkout: self
Expand Down

12 changes: 8 additions & 4 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ parameters:
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 disableComponentGovernance: false
 disableComponentGovernance: ''
 mergeTestResults: false
 testRunTitle: ''
 testResultsFormat: ''
Expand DownExpand Up@@ -142,9 +142,13 @@ jobs:
 richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
 continueOnError: true

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
 - task: ComponentGovernanceComponentDetection@0
 continueOnError: true
 - template: /eng/common/templates/steps/component-governance.yml
 parameters:
 ${{ if eq(parameters.disableComponentGovernance, '') }}:
 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
 disableComponentGovernance: false
 ${{ else }}:
 disableComponentGovernance: true

 - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down

43 changes: 23 additions & 20 deletions
eng/common/templates/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ parameters:
 ReusePr: true
 UseLfLineEndings: true
 UseCheckedInLocProjectJson: false
 SkipLocProjectJsonGeneration: false
 LanguageSet: VS_Main_Languages
 LclSource: lclFilesInRepo
 LclPackageId: ''
Expand All@@ -22,13 +23,25 @@ parameters:
 MirrorRepo: ''
 MirrorBranch: main
 condition: ''
 JobNameSuffix: ''

jobs:
- job: OneLocBuild
- job: OneLocBuild${{ parameters.JobNameSuffix }}

 dependsOn: ${{ parameters.dependsOn }}

 displayName: OneLocBuild
 displayName: OneLocBuild${{ parameters.JobNameSuffix }}

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
Expand All@@ -40,27 +53,17 @@ jobs:
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson


 steps:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}
 - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}

 - task: OneLocBuild@2
 displayName: OneLocBuild
Expand Down

14 changes: 12 additions & 2 deletions
eng/common/templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,15 +34,15 @@ jobs:
- job: Asset_Registry_Publish

 dependsOn: ${{ parameters.dependsOn }}
 timeoutInMinutes: 150

 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 displayName: Publish Assets
 ${{ else }}:
 displayName: Publish to Build Asset Registry

 pool: ${{ parameters.pool }}

 variables:
 - template: /eng/common/templates/variables/pool-providers.yml
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: Publish-Build-Assets
 - group: AzureDevOps-Artifact-Feeds-Pats
Expand All@@ -51,6 +51,16 @@ jobs:
 - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 - template: /eng/common/templates/post-build/common-variables.yml

 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - task: DownloadBuildArtifacts@0
Expand Down

7 changes: 5 additions & 2 deletions
eng/common/templates/job/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,16 @@ jobs:
 ${{ if eq(parameters.platform.pool, '') }}:
 # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
 # source-build builds run in Docker, including the default managed platform.
 # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 ${{ if ne(parameters.platform.pool, '') }}:
 pool: ${{ parameters.platform.pool }}

Expand Down

5 changes: 3 additions & 2 deletions
eng/common/templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,17 @@ jobs:
 value: ${{ parameters.binlogPath }}
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: source-dot-net stage1 variables
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
 ${{ if eq(parameters.pool, '') }}:
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $(DncEngPublicBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64.open
 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
Expand Down

9 changes: 0 additions & 9 deletions
eng/common/templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,15 +88,6 @@ jobs:
 - ${{ job.job }}
 - ${{ if eq(parameters.enableSourceBuild, true) }}:
 - Source_Build_Complete
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 demands: ImageOverride -equals windows.vs2019.amd64

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#6566

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

michaelgsharp
merged 7 commits into

from

May 5, 2023
 Merged


[main] Update dependencies from dotnet/arcade
#6566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
a292c0e

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 13, 2023
fc6419b

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 15, 2023
1d205a5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 27, 2023
e01be7c

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Mar 15, 2023
166f506

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 11, 2023
01676c5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 24, 2023
7501915

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] May 1, 2023

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


24 changes: 12 additions & 12 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,25 +7,25 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
 <Uri>https://github.com/dotnet/arcade-services</Uri>
Expand All@@ -39,9 +39,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
 <Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

48 changes: 45 additions & 3 deletions
eng/common/generate-locproject.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern

$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
if (-not $wxlFiles) {
 $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
 if ($wxlEnFiles) {
 $wxlFiles = @()
 $wxlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
 }
}

$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
$macosHtmlFiles = @()
if ($macosHtmlEnFiles) {
 $macosHtmlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
}

$xlfFiles = @()

Expand DownExpand Up@@ -91,15 +110,15 @@ $locJson = @{
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "WiX_CloneLanguages"
 LssFiles = @( "wxl_loc.lss" )
 LocItems = @(
 $wxlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion))
 {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
Expand All@@ -110,7 +129,30 @@ $locJson = @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
 }
 }
 }
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "VS_macOS_CloneLanguages"
 LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
 LocItems = @(
 $macosHtmlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
 $sourceFile = ($_.FullName | Resolve-Path -Relative)
 if ($continue) {
 return @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 }
 }
 }
Expand Down
Binary file addedeng/common/loc/P22DotNetHtmlLocalization.lss

View file


Open in desktop


Binary file not shown.


2 changes: 1 addition & 1 deletion
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
 # Set default versions
 if [[ -z "$majorVersion" ]]; then
 # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
 if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi

 for version in "${versions[@]}"; do
Expand Down

3 changes: 2 additions & 1 deletion
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,14 +46,15 @@ jobs:
 - template: /eng/common/templates/variables/sdl-variables.yml
 - name: GuardianVersion
 value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
 - template: /eng/common/templates/variables/pool-providers.yml
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64
 steps:
 - checkout: self
Expand Down

12 changes: 8 additions & 4 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ parameters:
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 disableComponentGovernance: false
 disableComponentGovernance: ''
 mergeTestResults: false
 testRunTitle: ''
 testResultsFormat: ''
Expand DownExpand Up@@ -142,9 +142,13 @@ jobs:
 richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
 continueOnError: true

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
 - task: ComponentGovernanceComponentDetection@0
 continueOnError: true
 - template: /eng/common/templates/steps/component-governance.yml
 parameters:
 ${{ if eq(parameters.disableComponentGovernance, '') }}:
 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
 disableComponentGovernance: false
 ${{ else }}:
 disableComponentGovernance: true

 - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down

43 changes: 23 additions & 20 deletions
eng/common/templates/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ parameters:
 ReusePr: true
 UseLfLineEndings: true
 UseCheckedInLocProjectJson: false
 SkipLocProjectJsonGeneration: false
 LanguageSet: VS_Main_Languages
 LclSource: lclFilesInRepo
 LclPackageId: ''
Expand All@@ -22,13 +23,25 @@ parameters:
 MirrorRepo: ''
 MirrorBranch: main
 condition: ''
 JobNameSuffix: ''

jobs:
- job: OneLocBuild
- job: OneLocBuild${{ parameters.JobNameSuffix }}

 dependsOn: ${{ parameters.dependsOn }}

 displayName: OneLocBuild
 displayName: OneLocBuild${{ parameters.JobNameSuffix }}

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
Expand All@@ -40,27 +53,17 @@ jobs:
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson


 steps:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}
 - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}

 - task: OneLocBuild@2
 displayName: OneLocBuild
Expand Down

14 changes: 12 additions & 2 deletions
eng/common/templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,15 +34,15 @@ jobs:
- job: Asset_Registry_Publish

 dependsOn: ${{ parameters.dependsOn }}
 timeoutInMinutes: 150

 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 displayName: Publish Assets
 ${{ else }}:
 displayName: Publish to Build Asset Registry

 pool: ${{ parameters.pool }}

 variables:
 - template: /eng/common/templates/variables/pool-providers.yml
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: Publish-Build-Assets
 - group: AzureDevOps-Artifact-Feeds-Pats
Expand All@@ -51,6 +51,16 @@ jobs:
 - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 - template: /eng/common/templates/post-build/common-variables.yml

 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - task: DownloadBuildArtifacts@0
Expand Down

7 changes: 5 additions & 2 deletions
eng/common/templates/job/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,16 @@ jobs:
 ${{ if eq(parameters.platform.pool, '') }}:
 # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
 # source-build builds run in Docker, including the default managed platform.
 # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 ${{ if ne(parameters.platform.pool, '') }}:
 pool: ${{ parameters.platform.pool }}

Expand Down

5 changes: 3 additions & 2 deletions
eng/common/templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,17 @@ jobs:
 value: ${{ parameters.binlogPath }}
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: source-dot-net stage1 variables
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
 ${{ if eq(parameters.pool, '') }}:
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $(DncEngPublicBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64.open
 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
Expand Down

9 changes: 0 additions & 9 deletions
eng/common/templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,15 +88,6 @@ jobs:
 - ${{ job.job }}
 - ${{ if eq(parameters.enableSourceBuild, true) }}:
 - Source_Build_Complete
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 demands: ImageOverride -equals windows.vs2019.amd64

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#6566

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

michaelgsharp
merged 7 commits into

from

May 5, 2023
 Merged


[main] Update dependencies from dotnet/arcade
#6566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
a292c0e

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 13, 2023
fc6419b

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 15, 2023
1d205a5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 27, 2023
e01be7c

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Mar 15, 2023
166f506

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 11, 2023
01676c5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 24, 2023
7501915

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] May 1, 2023

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


24 changes: 12 additions & 12 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,25 +7,25 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
 <Uri>https://github.com/dotnet/arcade-services</Uri>
Expand All@@ -39,9 +39,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
 <Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

48 changes: 45 additions & 3 deletions
eng/common/generate-locproject.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern

$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
if (-not $wxlFiles) {
 $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
 if ($wxlEnFiles) {
 $wxlFiles = @()
 $wxlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
 }
}

$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
$macosHtmlFiles = @()
if ($macosHtmlEnFiles) {
 $macosHtmlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
}

$xlfFiles = @()

Expand DownExpand Up@@ -91,15 +110,15 @@ $locJson = @{
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "WiX_CloneLanguages"
 LssFiles = @( "wxl_loc.lss" )
 LocItems = @(
 $wxlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion))
 {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
Expand All@@ -110,7 +129,30 @@ $locJson = @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
 }
 }
 }
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "VS_macOS_CloneLanguages"
 LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
 LocItems = @(
 $macosHtmlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
 $sourceFile = ($_.FullName | Resolve-Path -Relative)
 if ($continue) {
 return @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 }
 }
 }
Expand Down
Binary file addedeng/common/loc/P22DotNetHtmlLocalization.lss

View file


Open in desktop


Binary file not shown.


2 changes: 1 addition & 1 deletion
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
 # Set default versions
 if [[ -z "$majorVersion" ]]; then
 # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
 if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi

 for version in "${versions[@]}"; do
Expand Down

3 changes: 2 additions & 1 deletion
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,14 +46,15 @@ jobs:
 - template: /eng/common/templates/variables/sdl-variables.yml
 - name: GuardianVersion
 value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
 - template: /eng/common/templates/variables/pool-providers.yml
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64
 steps:
 - checkout: self
Expand Down

12 changes: 8 additions & 4 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ parameters:
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 disableComponentGovernance: false
 disableComponentGovernance: ''
 mergeTestResults: false
 testRunTitle: ''
 testResultsFormat: ''
Expand DownExpand Up@@ -142,9 +142,13 @@ jobs:
 richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
 continueOnError: true

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
 - task: ComponentGovernanceComponentDetection@0
 continueOnError: true
 - template: /eng/common/templates/steps/component-governance.yml
 parameters:
 ${{ if eq(parameters.disableComponentGovernance, '') }}:
 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
 disableComponentGovernance: false
 ${{ else }}:
 disableComponentGovernance: true

 - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down

43 changes: 23 additions & 20 deletions
eng/common/templates/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ parameters:
 ReusePr: true
 UseLfLineEndings: true
 UseCheckedInLocProjectJson: false
 SkipLocProjectJsonGeneration: false
 LanguageSet: VS_Main_Languages
 LclSource: lclFilesInRepo
 LclPackageId: ''
Expand All@@ -22,13 +23,25 @@ parameters:
 MirrorRepo: ''
 MirrorBranch: main
 condition: ''
 JobNameSuffix: ''

jobs:
- job: OneLocBuild
- job: OneLocBuild${{ parameters.JobNameSuffix }}

 dependsOn: ${{ parameters.dependsOn }}

 displayName: OneLocBuild
 displayName: OneLocBuild${{ parameters.JobNameSuffix }}

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
Expand All@@ -40,27 +53,17 @@ jobs:
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson


 steps:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}
 - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}

 - task: OneLocBuild@2
 displayName: OneLocBuild
Expand Down

14 changes: 12 additions & 2 deletions
eng/common/templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,15 +34,15 @@ jobs:
- job: Asset_Registry_Publish

 dependsOn: ${{ parameters.dependsOn }}
 timeoutInMinutes: 150

 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 displayName: Publish Assets
 ${{ else }}:
 displayName: Publish to Build Asset Registry

 pool: ${{ parameters.pool }}

 variables:
 - template: /eng/common/templates/variables/pool-providers.yml
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: Publish-Build-Assets
 - group: AzureDevOps-Artifact-Feeds-Pats
Expand All@@ -51,6 +51,16 @@ jobs:
 - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 - template: /eng/common/templates/post-build/common-variables.yml

 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - task: DownloadBuildArtifacts@0
Expand Down

7 changes: 5 additions & 2 deletions
eng/common/templates/job/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,16 @@ jobs:
 ${{ if eq(parameters.platform.pool, '') }}:
 # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
 # source-build builds run in Docker, including the default managed platform.
 # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 ${{ if ne(parameters.platform.pool, '') }}:
 pool: ${{ parameters.platform.pool }}

Expand Down

5 changes: 3 additions & 2 deletions
eng/common/templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,17 @@ jobs:
 value: ${{ parameters.binlogPath }}
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: source-dot-net stage1 variables
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
 ${{ if eq(parameters.pool, '') }}:
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $(DncEngPublicBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64.open
 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
Expand Down

9 changes: 0 additions & 9 deletions
eng/common/templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,15 +88,6 @@ jobs:
 - ${{ job.job }}
 - ${{ if eq(parameters.enableSourceBuild, true) }}:
 - Source_Build_Complete
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 demands: ImageOverride -equals windows.vs2019.amd64

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[main] Update dependencies from dotnet/arcade#6566

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

michaelgsharp
merged 7 commits into

from

May 5, 2023
 Merged


[main] Update dependencies from dotnet/arcade
#6566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
a292c0e

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 13, 2023
fc6419b

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 15, 2023
1d205a5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 27, 2023
e01be7c

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Mar 15, 2023
166f506

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 11, 2023
01676c5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 24, 2023
7501915

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] May 1, 2023

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


24 changes: 12 additions & 12 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,25 +7,25 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
 <Uri>https://github.com/dotnet/arcade-services</Uri>
Expand All@@ -39,9 +39,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
 <Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

48 changes: 45 additions & 3 deletions
eng/common/generate-locproject.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern

$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
if (-not $wxlFiles) {
 $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
 if ($wxlEnFiles) {
 $wxlFiles = @()
 $wxlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
 }
}

$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
$macosHtmlFiles = @()
if ($macosHtmlEnFiles) {
 $macosHtmlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
}

$xlfFiles = @()

Expand DownExpand Up@@ -91,15 +110,15 @@ $locJson = @{
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "WiX_CloneLanguages"
 LssFiles = @( "wxl_loc.lss" )
 LocItems = @(
 $wxlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion))
 {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
Expand All@@ -110,7 +129,30 @@ $locJson = @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
 }
 }
 }
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "VS_macOS_CloneLanguages"
 LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
 LocItems = @(
 $macosHtmlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
 $sourceFile = ($_.FullName | Resolve-Path -Relative)
 if ($continue) {
 return @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 }
 }
 }
Expand Down
Binary file addedeng/common/loc/P22DotNetHtmlLocalization.lss

View file


Open in desktop


Binary file not shown.


2 changes: 1 addition & 1 deletion
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
 # Set default versions
 if [[ -z "$majorVersion" ]]; then
 # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
 if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi

 for version in "${versions[@]}"; do
Expand Down

3 changes: 2 additions & 1 deletion
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,14 +46,15 @@ jobs:
 - template: /eng/common/templates/variables/sdl-variables.yml
 - name: GuardianVersion
 value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
 - template: /eng/common/templates/variables/pool-providers.yml
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64
 steps:
 - checkout: self
Expand Down

12 changes: 8 additions & 4 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ parameters:
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 disableComponentGovernance: false
 disableComponentGovernance: ''
 mergeTestResults: false
 testRunTitle: ''
 testResultsFormat: ''
Expand DownExpand Up@@ -142,9 +142,13 @@ jobs:
 richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
 continueOnError: true

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
 - task: ComponentGovernanceComponentDetection@0
 continueOnError: true
 - template: /eng/common/templates/steps/component-governance.yml
 parameters:
 ${{ if eq(parameters.disableComponentGovernance, '') }}:
 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
 disableComponentGovernance: false
 ${{ else }}:
 disableComponentGovernance: true

 - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down

43 changes: 23 additions & 20 deletions
eng/common/templates/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ parameters:
 ReusePr: true
 UseLfLineEndings: true
 UseCheckedInLocProjectJson: false
 SkipLocProjectJsonGeneration: false
 LanguageSet: VS_Main_Languages
 LclSource: lclFilesInRepo
 LclPackageId: ''
Expand All@@ -22,13 +23,25 @@ parameters:
 MirrorRepo: ''
 MirrorBranch: main
 condition: ''
 JobNameSuffix: ''

jobs:
- job: OneLocBuild
- job: OneLocBuild${{ parameters.JobNameSuffix }}

 dependsOn: ${{ parameters.dependsOn }}

 displayName: OneLocBuild
 displayName: OneLocBuild${{ parameters.JobNameSuffix }}

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
Expand All@@ -40,27 +53,17 @@ jobs:
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson


 steps:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}
 - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}

 - task: OneLocBuild@2
 displayName: OneLocBuild
Expand Down

14 changes: 12 additions & 2 deletions
eng/common/templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,15 +34,15 @@ jobs:
- job: Asset_Registry_Publish

 dependsOn: ${{ parameters.dependsOn }}
 timeoutInMinutes: 150

 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 displayName: Publish Assets
 ${{ else }}:
 displayName: Publish to Build Asset Registry

 pool: ${{ parameters.pool }}

 variables:
 - template: /eng/common/templates/variables/pool-providers.yml
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: Publish-Build-Assets
 - group: AzureDevOps-Artifact-Feeds-Pats
Expand All@@ -51,6 +51,16 @@ jobs:
 - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 - template: /eng/common/templates/post-build/common-variables.yml

 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - task: DownloadBuildArtifacts@0
Expand Down

7 changes: 5 additions & 2 deletions
eng/common/templates/job/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,16 @@ jobs:
 ${{ if eq(parameters.platform.pool, '') }}:
 # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
 # source-build builds run in Docker, including the default managed platform.
 # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 ${{ if ne(parameters.platform.pool, '') }}:
 pool: ${{ parameters.platform.pool }}

Expand Down

5 changes: 3 additions & 2 deletions
eng/common/templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,17 @@ jobs:
 value: ${{ parameters.binlogPath }}
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: source-dot-net stage1 variables
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
 ${{ if eq(parameters.pool, '') }}:
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $(DncEngPublicBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64.open
 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
Expand Down

9 changes: 0 additions & 9 deletions
eng/common/templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,15 +88,6 @@ jobs:
 - ${{ job.job }}
 - ${{ if eq(parameters.enableSourceBuild, true) }}:
 - Source_Build_Complete
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 demands: ImageOverride -equals windows.vs2019.amd64

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#6566

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

michaelgsharp
merged 7 commits into

from

May 5, 2023
 Merged


[main] Update dependencies from dotnet/arcade
#6566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
a292c0e

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 13, 2023
fc6419b

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 15, 2023
1d205a5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 27, 2023
e01be7c

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Mar 15, 2023
166f506

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 11, 2023
01676c5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 24, 2023
7501915

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] May 1, 2023

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


24 changes: 12 additions & 12 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,25 +7,25 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
 <Uri>https://github.com/dotnet/arcade-services</Uri>
Expand All@@ -39,9 +39,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
 <Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

48 changes: 45 additions & 3 deletions
eng/common/generate-locproject.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern

$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
if (-not $wxlFiles) {
 $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
 if ($wxlEnFiles) {
 $wxlFiles = @()
 $wxlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
 }
}

$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
$macosHtmlFiles = @()
if ($macosHtmlEnFiles) {
 $macosHtmlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
}

$xlfFiles = @()

Expand DownExpand Up@@ -91,15 +110,15 @@ $locJson = @{
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "WiX_CloneLanguages"
 LssFiles = @( "wxl_loc.lss" )
 LocItems = @(
 $wxlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion))
 {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
Expand All@@ -110,7 +129,30 @@ $locJson = @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
 }
 }
 }
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "VS_macOS_CloneLanguages"
 LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
 LocItems = @(
 $macosHtmlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
 $sourceFile = ($_.FullName | Resolve-Path -Relative)
 if ($continue) {
 return @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 }
 }
 }
Expand Down
Binary file addedeng/common/loc/P22DotNetHtmlLocalization.lss

View file


Open in desktop


Binary file not shown.


2 changes: 1 addition & 1 deletion
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
 # Set default versions
 if [[ -z "$majorVersion" ]]; then
 # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
 if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi

 for version in "${versions[@]}"; do
Expand Down

3 changes: 2 additions & 1 deletion
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,14 +46,15 @@ jobs:
 - template: /eng/common/templates/variables/sdl-variables.yml
 - name: GuardianVersion
 value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
 - template: /eng/common/templates/variables/pool-providers.yml
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64
 steps:
 - checkout: self
Expand Down

12 changes: 8 additions & 4 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ parameters:
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 disableComponentGovernance: false
 disableComponentGovernance: ''
 mergeTestResults: false
 testRunTitle: ''
 testResultsFormat: ''
Expand DownExpand Up@@ -142,9 +142,13 @@ jobs:
 richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
 continueOnError: true

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
 - task: ComponentGovernanceComponentDetection@0
 continueOnError: true
 - template: /eng/common/templates/steps/component-governance.yml
 parameters:
 ${{ if eq(parameters.disableComponentGovernance, '') }}:
 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
 disableComponentGovernance: false
 ${{ else }}:
 disableComponentGovernance: true

 - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down

43 changes: 23 additions & 20 deletions
eng/common/templates/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ parameters:
 ReusePr: true
 UseLfLineEndings: true
 UseCheckedInLocProjectJson: false
 SkipLocProjectJsonGeneration: false
 LanguageSet: VS_Main_Languages
 LclSource: lclFilesInRepo
 LclPackageId: ''
Expand All@@ -22,13 +23,25 @@ parameters:
 MirrorRepo: ''
 MirrorBranch: main
 condition: ''
 JobNameSuffix: ''

jobs:
- job: OneLocBuild
- job: OneLocBuild${{ parameters.JobNameSuffix }}

 dependsOn: ${{ parameters.dependsOn }}

 displayName: OneLocBuild
 displayName: OneLocBuild${{ parameters.JobNameSuffix }}

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
Expand All@@ -40,27 +53,17 @@ jobs:
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson


 steps:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}
 - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}

 - task: OneLocBuild@2
 displayName: OneLocBuild
Expand Down

14 changes: 12 additions & 2 deletions
eng/common/templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,15 +34,15 @@ jobs:
- job: Asset_Registry_Publish

 dependsOn: ${{ parameters.dependsOn }}
 timeoutInMinutes: 150

 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 displayName: Publish Assets
 ${{ else }}:
 displayName: Publish to Build Asset Registry

 pool: ${{ parameters.pool }}

 variables:
 - template: /eng/common/templates/variables/pool-providers.yml
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: Publish-Build-Assets
 - group: AzureDevOps-Artifact-Feeds-Pats
Expand All@@ -51,6 +51,16 @@ jobs:
 - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 - template: /eng/common/templates/post-build/common-variables.yml

 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - task: DownloadBuildArtifacts@0
Expand Down

7 changes: 5 additions & 2 deletions
eng/common/templates/job/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,16 @@ jobs:
 ${{ if eq(parameters.platform.pool, '') }}:
 # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
 # source-build builds run in Docker, including the default managed platform.
 # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 ${{ if ne(parameters.platform.pool, '') }}:
 pool: ${{ parameters.platform.pool }}

Expand Down

5 changes: 3 additions & 2 deletions
eng/common/templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,17 @@ jobs:
 value: ${{ parameters.binlogPath }}
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: source-dot-net stage1 variables
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
 ${{ if eq(parameters.pool, '') }}:
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $(DncEngPublicBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64.open
 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
Expand Down

9 changes: 0 additions & 9 deletions
eng/common/templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,15 +88,6 @@ jobs:
 - ${{ job.job }}
 - ${{ if eq(parameters.enableSourceBuild, true) }}:
 - Source_Build_Complete
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 demands: ImageOverride -equals windows.vs2019.amd64

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#6566

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

michaelgsharp
merged 7 commits into

from

May 5, 2023
 Merged


[main] Update dependencies from dotnet/arcade
#6566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
a292c0e

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 13, 2023
fc6419b

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 15, 2023
1d205a5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 27, 2023
e01be7c

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Mar 15, 2023
166f506

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 11, 2023
01676c5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 24, 2023
7501915

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] May 1, 2023

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


24 changes: 12 additions & 12 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,25 +7,25 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
 <Uri>https://github.com/dotnet/arcade-services</Uri>
Expand All@@ -39,9 +39,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
 <Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

48 changes: 45 additions & 3 deletions
eng/common/generate-locproject.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern

$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
if (-not $wxlFiles) {
 $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
 if ($wxlEnFiles) {
 $wxlFiles = @()
 $wxlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
 }
}

$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
$macosHtmlFiles = @()
if ($macosHtmlEnFiles) {
 $macosHtmlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
}

$xlfFiles = @()

Expand DownExpand Up@@ -91,15 +110,15 @@ $locJson = @{
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "WiX_CloneLanguages"
 LssFiles = @( "wxl_loc.lss" )
 LocItems = @(
 $wxlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion))
 {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
Expand All@@ -110,7 +129,30 @@ $locJson = @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
 }
 }
 }
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "VS_macOS_CloneLanguages"
 LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
 LocItems = @(
 $macosHtmlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
 $sourceFile = ($_.FullName | Resolve-Path -Relative)
 if ($continue) {
 return @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 }
 }
 }
Expand Down
Binary file addedeng/common/loc/P22DotNetHtmlLocalization.lss

View file


Open in desktop


Binary file not shown.


2 changes: 1 addition & 1 deletion
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
 # Set default versions
 if [[ -z "$majorVersion" ]]; then
 # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
 if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi

 for version in "${versions[@]}"; do
Expand Down

3 changes: 2 additions & 1 deletion
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,14 +46,15 @@ jobs:
 - template: /eng/common/templates/variables/sdl-variables.yml
 - name: GuardianVersion
 value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
 - template: /eng/common/templates/variables/pool-providers.yml
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64
 steps:
 - checkout: self
Expand Down

12 changes: 8 additions & 4 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ parameters:
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 disableComponentGovernance: false
 disableComponentGovernance: ''
 mergeTestResults: false
 testRunTitle: ''
 testResultsFormat: ''
Expand DownExpand Up@@ -142,9 +142,13 @@ jobs:
 richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
 continueOnError: true

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
 - task: ComponentGovernanceComponentDetection@0
 continueOnError: true
 - template: /eng/common/templates/steps/component-governance.yml
 parameters:
 ${{ if eq(parameters.disableComponentGovernance, '') }}:
 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
 disableComponentGovernance: false
 ${{ else }}:
 disableComponentGovernance: true

 - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down

43 changes: 23 additions & 20 deletions
eng/common/templates/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ parameters:
 ReusePr: true
 UseLfLineEndings: true
 UseCheckedInLocProjectJson: false
 SkipLocProjectJsonGeneration: false
 LanguageSet: VS_Main_Languages
 LclSource: lclFilesInRepo
 LclPackageId: ''
Expand All@@ -22,13 +23,25 @@ parameters:
 MirrorRepo: ''
 MirrorBranch: main
 condition: ''
 JobNameSuffix: ''

jobs:
- job: OneLocBuild
- job: OneLocBuild${{ parameters.JobNameSuffix }}

 dependsOn: ${{ parameters.dependsOn }}

 displayName: OneLocBuild
 displayName: OneLocBuild${{ parameters.JobNameSuffix }}

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
Expand All@@ -40,27 +53,17 @@ jobs:
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson


 steps:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}
 - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}

 - task: OneLocBuild@2
 displayName: OneLocBuild
Expand Down

14 changes: 12 additions & 2 deletions
eng/common/templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,15 +34,15 @@ jobs:
- job: Asset_Registry_Publish

 dependsOn: ${{ parameters.dependsOn }}
 timeoutInMinutes: 150

 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 displayName: Publish Assets
 ${{ else }}:
 displayName: Publish to Build Asset Registry

 pool: ${{ parameters.pool }}

 variables:
 - template: /eng/common/templates/variables/pool-providers.yml
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: Publish-Build-Assets
 - group: AzureDevOps-Artifact-Feeds-Pats
Expand All@@ -51,6 +51,16 @@ jobs:
 - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 - template: /eng/common/templates/post-build/common-variables.yml

 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - task: DownloadBuildArtifacts@0
Expand Down

7 changes: 5 additions & 2 deletions
eng/common/templates/job/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,16 @@ jobs:
 ${{ if eq(parameters.platform.pool, '') }}:
 # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
 # source-build builds run in Docker, including the default managed platform.
 # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 ${{ if ne(parameters.platform.pool, '') }}:
 pool: ${{ parameters.platform.pool }}

Expand Down

5 changes: 3 additions & 2 deletions
eng/common/templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,17 @@ jobs:
 value: ${{ parameters.binlogPath }}
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: source-dot-net stage1 variables
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
 ${{ if eq(parameters.pool, '') }}:
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $(DncEngPublicBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64.open
 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
Expand Down

9 changes: 0 additions & 9 deletions
eng/common/templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,15 +88,6 @@ jobs:
 - ${{ job.job }}
 - ${{ if eq(parameters.enableSourceBuild, true) }}:
 - Source_Build_Complete
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 demands: ImageOverride -equals windows.vs2019.amd64

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[main] Update dependencies from dotnet/arcade#6566

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

michaelgsharp
merged 7 commits into

from

May 5, 2023
 Merged


[main] Update dependencies from dotnet/arcade
#6566
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
a292c0e

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 13, 2023
fc6419b

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 15, 2023
1d205a5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Feb 27, 2023
e01be7c

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Mar 15, 2023
166f506

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 11, 2023
01676c5

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] Apr 24, 2023
7501915

Update dependencies from https://github.com/dotnet/arcade build 20230…


dotnet-maestro[bot] May 1, 2023

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


24 changes: 12 additions & 12 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,25 +7,25 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
 <Uri>https://github.com/dotnet/arcade-services</Uri>
Expand All@@ -39,9 +39,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23073.6">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>5f8519337c864af63b8692754ca0fa971bfc55d4</Sha>
 <Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
 <Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@
 <DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23073.6</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

48 changes: 45 additions & 3 deletions
eng/common/generate-locproject.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern

$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
if (-not $wxlFiles) {
 $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
 if ($wxlEnFiles) {
 $wxlFiles = @()
 $wxlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
 }
}

$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
$macosHtmlFiles = @()
if ($macosHtmlEnFiles) {
 $macosHtmlEnFiles | ForEach-Object {
 $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
 $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
 }
}

$xlfFiles = @()

Expand DownExpand Up@@ -91,15 +110,15 @@ $locJson = @{
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "WiX_CloneLanguages"
 LssFiles = @( "wxl_loc.lss" )
 LocItems = @(
 $wxlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion))
 {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
Expand All@@ -110,7 +129,30 @@ $locJson = @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
 }
 }
 }
 )
 },
 @{
 LanguageSet = $LanguageSet
 CloneLanguageSet = "VS_macOS_CloneLanguages"
 LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" )
 LocItems = @(
 $macosHtmlFiles | ForEach-Object {
 $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
 $continue = $true
 foreach ($exclusion in $exclusions.Exclusions) {
 if ($_.FullName.Contains($exclusion)) {
 $continue = $false
 }
 }
 $sourceFile = ($_.FullName | Resolve-Path -Relative)
 if ($continue) {
 return @{
 SourceFile = $sourceFile
 CopyOption = "LangIDOnPath"
 OutputPath = $outputPath
 }
 }
 }
Expand Down
Binary file addedeng/common/loc/P22DotNetHtmlLocalization.lss

View file


Open in desktop


Binary file not shown.


2 changes: 1 addition & 1 deletion
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
 # Set default versions
 if [[ -z "$majorVersion" ]]; then
 # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
 if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
 elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi

 for version in "${versions[@]}"; do
Expand Down

3 changes: 2 additions & 1 deletion
eng/common/templates/job/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,14 +46,15 @@ jobs:
 - template: /eng/common/templates/variables/sdl-variables.yml
 - name: GuardianVersion
 value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
 - template: /eng/common/templates/variables/pool-providers.yml
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64
 steps:
 - checkout: self
Expand Down

12 changes: 8 additions & 4 deletions
eng/common/templates/job/job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ parameters:
 enablePublishBuildAssets: false
 enablePublishTestResults: false
 enablePublishUsingPipelines: false
 disableComponentGovernance: false
 disableComponentGovernance: ''
 mergeTestResults: false
 testRunTitle: ''
 testResultsFormat: ''
Expand DownExpand Up@@ -142,9 +142,13 @@ jobs:
 richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
 continueOnError: true

 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
 - task: ComponentGovernanceComponentDetection@0
 continueOnError: true
 - template: /eng/common/templates/steps/component-governance.yml
 parameters:
 ${{ if eq(parameters.disableComponentGovernance, '') }}:
 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
 disableComponentGovernance: false
 ${{ else }}:
 disableComponentGovernance: true

 - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down

43 changes: 23 additions & 20 deletions
eng/common/templates/job/onelocbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ parameters:
 ReusePr: true
 UseLfLineEndings: true
 UseCheckedInLocProjectJson: false
 SkipLocProjectJsonGeneration: false
 LanguageSet: VS_Main_Languages
 LclSource: lclFilesInRepo
 LclPackageId: ''
Expand All@@ -22,13 +23,25 @@ parameters:
 MirrorRepo: ''
 MirrorBranch: main
 condition: ''
 JobNameSuffix: ''

jobs:
- job: OneLocBuild
- job: OneLocBuild${{ parameters.JobNameSuffix }}

 dependsOn: ${{ parameters.dependsOn }}

 displayName: OneLocBuild
 displayName: OneLocBuild${{ parameters.JobNameSuffix }}

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
Expand All@@ -40,27 +53,17 @@ jobs:
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 variables:
 - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
 - name: _GenerateLocProjectArguments
 value: -SourcesDirectory ${{ parameters.SourcesDirectory }}
 -LanguageSet "${{ parameters.LanguageSet }}"
 -CreateNeutralXlfs
 - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}:
 - name: _GenerateLocProjectArguments
 value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson


 steps:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}
 - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
 - task: Powershell@2
 inputs:
 filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
 arguments: $(_GenerateLocProjectArguments)
 displayName: Generate LocProject.json
 condition: ${{ parameters.condition }}

 - task: OneLocBuild@2
 displayName: OneLocBuild
Expand Down

14 changes: 12 additions & 2 deletions
eng/common/templates/job/publish-build-assets.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,15 +34,15 @@ jobs:
- job: Asset_Registry_Publish

 dependsOn: ${{ parameters.dependsOn }}
 timeoutInMinutes: 150

 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 displayName: Publish Assets
 ${{ else }}:
 displayName: Publish to Build Asset Registry

 pool: ${{ parameters.pool }}

 variables:
 - template: /eng/common/templates/variables/pool-providers.yml
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: Publish-Build-Assets
 - group: AzureDevOps-Artifact-Feeds-Pats
Expand All@@ -51,6 +51,16 @@ jobs:
 - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
 - template: /eng/common/templates/post-build/common-variables.yml

 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - task: DownloadBuildArtifacts@0
Expand Down

7 changes: 5 additions & 2 deletions
eng/common/templates/job/source-build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,16 @@ jobs:
 ${{ if eq(parameters.platform.pool, '') }}:
 # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
 # source-build builds run in Docker, including the default managed platform.
 # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open

 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 ${{ if ne(parameters.platform.pool, '') }}:
 pool: ${{ parameters.platform.pool }}

Expand Down

5 changes: 3 additions & 2 deletions
eng/common/templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,17 @@ jobs:
 value: ${{ parameters.binlogPath }}
 - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
 - group: source-dot-net stage1 variables
 - template: /eng/common/templates/variables/pool-providers.yml

 ${{ if ne(parameters.pool, '') }}:
 pool: ${{ parameters.pool }}
 ${{ if eq(parameters.pool, '') }}:
 pool:
 ${{ if eq(variables['System.TeamProject'], 'public') }}:
 name: NetCore-Svc-Public
 name: $(DncEngPublicBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64.open
 ${{ if eq(variables['System.TeamProject'], 'internal') }}:
 name: NetCore1ESPool-Svc-Internal
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals windows.vs2019.amd64

 steps:
Expand Down

9 changes: 0 additions & 9 deletions
eng/common/templates/jobs/jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,15 +88,6 @@ jobs:
 - ${{ job.job }}
 - ${{ if eq(parameters.enableSourceBuild, true) }}:
 - Source_Build_Complete
 pool:
 # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
 name: VSEngSS-MicroBuild2022-1ES
 demands: Cmd
 # If it's not devdiv, it's dnceng
 ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
 name: NetCore1ESPool-Svc-Internal
 demands: ImageOverride -equals windows.vs2019.amd64

 runAsPublic: ${{ parameters.runAsPublic }}
 publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
Expand Down
Loading