Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
run: |
echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"
npm i -g markdownlint-cli
markdownlint "**/*.md"
markdownlint --ignore-path .github/workflows/markdownlintignore "**/*.md"
2 changes: 2 additions & 0 deletions .github/workflows/markdownlintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore files under eng/common (managed by dotnet/arcade)
eng/common/
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26059.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26067.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>367e3ab44812021f59aaf4c7506d5b4569769eec</Sha>
<Sha>b92cc5b406acf996b29a653dd4454b87f1d83c5f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26059.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26067.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>367e3ab44812021f59aaf4c7506d5b4569769eec</Sha>
<Sha>b92cc5b406acf996b29a653dd4454b87f1d83c5f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26059.1">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.26067.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>367e3ab44812021f59aaf4c7506d5b4569769eec</Sha>
<Sha>b92cc5b406acf996b29a653dd4454b87f1d83c5f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
<MicrosoftAspNetCoreTestHostVersion>6.0.36</MicrosoftAspNetCoreTestHostVersion>
<MicrosoftCrankEventSourcesVersion>0.2.0-alpha.24576.2</MicrosoftCrankEventSourcesVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26059.1</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.26067.2</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
<MoqVersion>4.18.4</MoqVersion>
<AutofacVersion>4.9.4</AutofacVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
demands: ImageOverride -equals build.ubuntu.2204.amd64
${{ if eq(variables['System.TeamProject'], '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')]
image: 1es-azurelinux-3
image: Azure-Linux-3-Amd64
os: linux
${{ else }}:
pool:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ stages:
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
demands: ImageOverride -equals windows.vs2022.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/template-guidance.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Basic guidance is:

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

### The `templateIs1ESManaged` parameter
#### The `templateIs1ESManaged` parameter

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.

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

## Development notes

### Folder / file structure
**Folder / file structure**

``` text
eng\common\
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/variables/pool-providers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# demands: ImageOverride -equals windows.vs2019.amd64
# demands: ImageOverride -equals windows.vs2022.amd64
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- template: /eng/common/templates-official/variables/pool-providers.yml
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "11.0.100-alpha.1.25618.104"
"version": "11.0.100-alpha.1.26060.102"
},
"tools": {
"dotnet": "11.0.100-alpha.1.25618.104",
"dotnet": "11.0.100-alpha.1.26060.102",
"runtimes": {
"dotnet": [
"8.0.13",
Expand All @@ -19,7 +19,7 @@
"runner": "Microsoft.Testing.Platform"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26059.1",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26059.1"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26067.2",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26067.2"
}
}
Loading