Skip to content

Commit bc9d83d

Browse files
dotnet-maestro[bot]CopilotMihaZupan
authored
[main] Update dependencies from dotnet/arcade (#2989)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: MihaZupan <25307628+MihaZupan@users.noreply.github.com>
1 parent 6d8b6fb commit bc9d83d

File tree

10 files changed

+21
-19
lines changed

10 files changed

+21
-19
lines changed

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
run: |
2424
echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"
2525
npm i -g markdownlint-cli
26-
markdownlint "**/*.md"
26+
markdownlint --ignore-path .github/workflows/markdownlintignore "**/*.md"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Ignore files under eng/common (managed by dotnet/arcade)
2+
eng/common/

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26059.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26067.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>367e3ab44812021f59aaf4c7506d5b4569769eec</Sha>
8+
<Sha>b92cc5b406acf996b29a653dd4454b87f1d83c5f</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26059.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26067.2">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>367e3ab44812021f59aaf4c7506d5b4569769eec</Sha>
12+
<Sha>b92cc5b406acf996b29a653dd4454b87f1d83c5f</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26059.1">
14+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26067.2">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>367e3ab44812021f59aaf4c7506d5b4569769eec</Sha>
16+
<Sha>b92cc5b406acf996b29a653dd4454b87f1d83c5f</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
1616
<MicrosoftAspNetCoreTestHostVersion>6.0.36</MicrosoftAspNetCoreTestHostVersion>
1717
<MicrosoftCrankEventSourcesVersion>0.2.0-alpha.24576.2</MicrosoftCrankEventSourcesVersion>
18-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26059.1</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
18+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26067.2</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
1919
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
2020
<MoqVersion>4.18.4</MoqVersion>
2121
<AutofacVersion>4.9.4</AutofacVersion>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2019.amd64
83+
image: windows.vs2022.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:

eng/common/core-templates/job/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
demands: ImageOverride -equals build.ubuntu.2204.amd64
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
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')]
66-
image: 1es-azurelinux-3
66+
image: Azure-Linux-3-Amd64
6767
os: linux
6868
${{ else }}:
6969
pool:

eng/common/core-templates/post-build/post-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ stages:
293293
${{ else }}:
294294
${{ if eq(parameters.is1ESPipeline, true) }}:
295295
name: NetCore1ESPool-Publishing-Internal
296-
image: windows.vs2019.amd64
296+
image: windows.vs2022.amd64
297297
os: windows
298298
${{ else }}:
299299
name: NetCore1ESPool-Publishing-Internal
300-
demands: ImageOverride -equals windows.vs2019.amd64
300+
demands: ImageOverride -equals windows.vs2022.amd64
301301
steps:
302302
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303303
parameters:

eng/common/template-guidance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Basic guidance is:
1212

1313
See [azure-pipelines.yml](../../azure-pipelines.yml) (templates-official example) or [azure-pipelines-pr.yml](../../azure-pipelines-pr.yml) (templates example) for examples.
1414

15-
### The `templateIs1ESManaged` parameter
15+
#### The `templateIs1ESManaged` parameter
1616

1717
The `templateIs1ESManaged` is available on most templates and affects which of the variants is used for nested templates. See [Development Notes](#development-notes) below for more information on the `templateIs1ESManaged1 parameter.
1818

@@ -59,7 +59,7 @@ Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable whe
5959

6060
## Development notes
6161

62-
### Folder / file structure
62+
**Folder / file structure**
6363

6464
``` text
6565
eng\common\

eng/common/templates/variables/pool-providers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
# pool:
2525
# name: $(DncEngInternalBuildPool)
26-
# demands: ImageOverride -equals windows.vs2019.amd64
26+
# demands: ImageOverride -equals windows.vs2022.amd64
2727
variables:
2828
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
2929
- template: /eng/common/templates-official/variables/pool-providers.yml

global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "11.0.100-alpha.1.25618.104"
3+
"version": "11.0.100-alpha.1.26060.102"
44
},
55
"tools": {
6-
"dotnet": "11.0.100-alpha.1.25618.104",
6+
"dotnet": "11.0.100-alpha.1.26060.102",
77
"runtimes": {
88
"dotnet": [
99
"8.0.13",
@@ -19,7 +19,7 @@
1919
"runner": "Microsoft.Testing.Platform"
2020
},
2121
"msbuild-sdks": {
22-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26059.1",
23-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26059.1"
22+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26067.2",
23+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26067.2"
2424
}
2525
}

0 commit comments

Comments
 (0)