Skip to content

Commit 82e35b8

Browse files
authored
Migrate the release build to use the 1ES agent pool and also fix the API scan (PowerShell#2859)
1 parent bc485e0 commit 82e35b8

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

.vsts-ci/releaseBuild.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: PSReadLine-ModuleBuild-$(Build.BuildId)
2-
trigger:
3-
branches:
4-
include:
5-
- master
2+
trigger: none
3+
pr: none
64

75
variables:
86
DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -20,7 +18,9 @@ stages:
2018
- stage: Build
2119
displayName: Build and Sign
2220
pool:
23-
name: Package ES CodeHub Lab E
21+
name: PowerShell1ES
22+
demands:
23+
- ImageOverride -equals MMS2019
2424
jobs:
2525
- job: build_windows
2626
displayName: Build PSReadLine
@@ -127,10 +127,14 @@ stages:
127127
displayName: Compliance
128128
dependsOn: Build
129129
pool:
130-
name: Package ES CodeHub Lab E
130+
name: PowerShell1ES
131+
demands:
132+
- ImageOverride -equals MMS2019
131133
jobs:
132134
- job: Compliance_Job
133135
displayName: PSReadLine Compliance
136+
variables:
137+
- group: APIScan
134138
# APIScan can take a long time
135139
timeoutInMinutes: 240
136140

@@ -176,3 +180,4 @@ stages:
176180
softwareFolder: '$(Pipeline.Workspace)\PSReadLine'
177181
softwareName: 'PSReadLine'
178182
softwareVersion: '$(ModuleVersion)'
183+
connectionString: 'RunAs=App;AppId=$(APIScanClient);TenantId=$(APIScanTenant);AppKey=$(APIScanSecret)'

MockPSConsole/MockPSConsole.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
21-
<PackageReference Include="Microsoft.PowerShell.SDK" version="7.2.0-preview.6" />
21+
<PackageReference Include="Microsoft.PowerShell.SDK" version="7.2.0-preview.9" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

PSReadLine/PSReadLine.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
25-
<PackageReference Include="System.Management.Automation" Version="7.2.0-preview.6" />
25+
<PackageReference Include="System.Management.Automation" Version="7.2.0-preview.9" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

Polyfill/Polyfill.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
15-
<PackageReference Include="System.Management.Automation" Version="7.2.0-preview.6" />
15+
<PackageReference Include="System.Management.Automation" Version="7.2.0-preview.9" />
1616
</ItemGroup>
1717

1818
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">

test/PSReadLine.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
27-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0-preview.6" />
27+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.0-preview.9" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

0 commit comments

Comments
 (0)