Skip to content

Commit

Permalink
Backport arcade and pipeline changes from main
Browse files Browse the repository at this point in the history
  • Loading branch information
Evangelink committed Apr 2, 2024
1 parent a005e25 commit 15355a2
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
13 changes: 7 additions & 6 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ parameters:
default: False

variables:
- template: /eng/common/templates-official/variables/pool-providers.yml@self
# Cannot use key:value syntax in root defined variables
- name: _TeamName
value: MSTest
Expand Down Expand Up @@ -87,8 +88,8 @@ extends:
featureFlags:
autoBaseline: true
pool:
name: netcore1espool-internal
image: 1es-windows-2022-pt
name: $(DncEngInternalBuildPool)
image: windows.vs2022.amd64
os: windows
customBuildTags:
- ES365AIMigrationTooling
Expand All @@ -111,8 +112,8 @@ extends:
- job: Windows
timeoutInMinutes: 90
pool:
name: netcore1espool-internal
image: 1es-windows-2022-pt
name: $(DncEngInternalBuildPool)
image: windows.vs2022.amd64
os: windows
steps:
- task: PowerShell@2
Expand Down Expand Up @@ -167,7 +168,7 @@ extends:
- job: Linux
timeoutInMinutes: 90
pool:
name: netcore1espool-internal
name: $(DncEngInternalBuildPool)
image: 1es-ubuntu-2204-pt
os: linux
steps:
Expand All @@ -194,4 +195,4 @@ extends:
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-TESTFX'

- template: eng\common\templates-official\post-build\post-build.yml@self
- template: eng\common\templates-official\post-build\post-build.yml@self
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ stages:
timeoutInMinutes: 90
pool:
name: NetCore-Public
demands: ImageOverride -equals build.ubuntu.2004.amd64.open
demands: ImageOverride -equals build.ubuntu.2004.amd64.open
strategy:
matrix:
Release:
Expand All @@ -143,4 +143,4 @@ stages:
chmod +x ./test.sh
./test.sh --configuration $(_BuildConfig) --ci --test --integrationTest
name: Test
displayName: Tests
displayName: Tests
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24161.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24179.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5c3fdd3b5aaaa32b24383ec12a60b37ebff13079</Sha>
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24161.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24179.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cd10e5d3748676d70ae2b4d9c84f073eeb203cac</Sha>
<Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"rollForward": "patch"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24161.1",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24179.4",
"MSBuild.Sdk.Extras": "3.0.44"
}
}

0 comments on commit 15355a2

Please sign in to comment.