Skip to content

Migrate the release build to use the 1ES agent pool and also fix the API scan #2859

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
merged 5 commits into from
Sep 15, 2021
Merged

Migrate the release build to use the 1ES agent pool and also fix the API scan #2859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
245aa8e
Update release build
daxian-dbw Sep 14, 2021
592b156
Disable -CheckHelpContent switch for testing
daxian-dbw Sep 14, 2021
8d79585
Correct the pool name
daxian-dbw Sep 14, 2021
c1b1946
Pass in connection string to APIScan task
daxian-dbw Sep 15, 2021
0b1b225
Re-enable the help content check
daxian-dbw Sep 15, 2021
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
17 changes: 11 additions & 6 deletions .vsts-ci/releaseBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: PSReadLine-ModuleBuild-$(Build.BuildId)
trigger:
branches:
include:
- master
trigger: none
pr: none

variables:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
Expand All @@ -20,7 +18,9 @@ stages:
- stage: Build
displayName: Build and Sign
pool:
name: Package ES CodeHub Lab E
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019
jobs:
- job: build_windows
displayName: Build PSReadLine
Expand Down Expand Up @@ -127,10 +127,14 @@ stages:
displayName: Compliance
dependsOn: Build
pool:
name: Package ES CodeHub Lab E
name: PowerShell1ES
demands:
- ImageOverride -equals MMS2019
jobs:
- job: Compliance_Job
displayName: PSReadLine Compliance
variables:
- group: APIScan
# APIScan can take a long time
timeoutInMinutes: 240

Expand Down Expand Up @@ -176,3 +180,4 @@ stages:
softwareFolder: '$(Pipeline.Workspace)\PSReadLine'
softwareName: 'PSReadLine'
softwareVersion: '$(ModuleVersion)'
connectionString: 'RunAs=App;AppId=$(APIScanClient);TenantId=$(APIScanTenant);AppKey=$(APIScanSecret)'
2 changes: 1 addition & 1 deletion MockPSConsole/MockPSConsole.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

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

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion PSReadLine/PSReadLine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

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

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Polyfill/Polyfill.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

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

<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
Expand Down
2 changes: 1 addition & 1 deletion test/PSReadLine.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</ItemGroup>

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

<ItemGroup>
Expand Down