Skip to content

Commit ae3e77e

Browse files
Add 1es-MsGraphBuildAgentsWindowsPsSDK (#1263)
* Add 1es-MsGraphBuildAgentsWindowsPsSDK Do not pull this in until we are happy with the performance of the 1es agent. * Change from msbuild to dotnet to run Roslyn analyzer 1ES image doesn't have VS. * Update from .NET 5 to .NET 6 * Use rooted path for roslyn analyzer command line * Set msBuildArchitecture to DotNetCore * Increase Node heap size to reduce garbage collection This is a shot in the dark change. It would be helpful if AutoREST has perf counters instrumented in it. * change to final pool name * update to use 1es-windows-ps-compute Co-authored-by: Peter Ombwa <[email protected]>
1 parent 6c138c2 commit ae3e77e

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.azure-pipelines/common-templates/install-tools-template.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ steps:
1515
version: 3.x
1616

1717
- task: UseDotNet@2
18-
displayName: 'Use .NET Core SDK 5 Current'
18+
displayName: 'Use .NET Core SDK 6 Current'
1919
inputs:
2020
debugMode: false
21-
version: 5.x
21+
version: 6.x
2222

2323
- task: NuGetToolInstaller@1
2424
displayName: 'Install Nuget 5.7'
@@ -76,4 +76,4 @@ steps:
7676
Register-PSRepository -Name 'LocalNugetFeed' -SourceLocation $nugetFeed -PublishLocation $nugetFeed -InstallationPolicy Trusted -Credential $credsAzureDevopsServices -PackageManagementProvider 'Nuget' -ErrorAction Continue
7777
Get-PSRepository
7878
Find-Module -Name Microsoft.Graph.Authentication -AllowPrerelease -Credential $credsAzureDevopsServices -AllVersions -Repository 'LocalNugetFeed'
79-
Find-Module -Name Microsoft.Graph.Authentication -AllowPrerelease -Repository 'LocalNugetFeed'
79+
Find-Module -Name Microsoft.Graph.Authentication -AllowPrerelease -Repository 'LocalNugetFeed'

.azure-pipelines/generate-auth-module-template.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ jobs:
6767
inputs:
6868
userProvideBuildInfo: 'msBuildInfo'
6969
msBuildVersion: '16.0'
70-
msBuildArchitecture: 'x64'
71-
msBuildCommandline: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64\msbuild.exe" $(System.DefaultWorkingDirectory)//src//Authentication//Authentication.sln /nologo /nr:false /p:VisualStudioVersion="16.0"'
70+
msBuildArchitecture: 'DotNetCore'
71+
msBuildCommandline: '"C:\Program Files\dotnet\dotnet.exe" msbuild $(System.DefaultWorkingDirectory)//src//Authentication//Authentication.sln /nologo /nr:false'
7272

7373
- task: CodeMetrics@1
7474
displayName: 'Run CodeMetrics'
@@ -220,4 +220,4 @@ jobs:
220220
inputs:
221221
PathtoPublish: '$(Build.ArtifactStagingDirectory)/$(AUTH_MODULE_NAME)'
222222
ArtifactName: 'drop'
223-
publishLocation: 'Container'
223+
publishLocation: 'Container'

.azure-pipelines/integrated-pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
parameters:
55
- name: BuildAgent
6-
default: MsGraphBuildAgentsWindowsPsSDK
6+
default: 1es-windows-ps-compute
77
displayName: Build Agent
88

99
- name: AzureSubscription
@@ -133,4 +133,4 @@ stages:
133133
- job: MsGraphPSSDKSecurityPostChecks
134134
displayName: Microsoft Graph PowerShell SDK Security Post Checks
135135
steps:
136-
- template: ./common-templates/security-postchecks-template.yml
136+
- template: ./common-templates/security-postchecks-template.yml

tools/GenerateModules.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ if (!(Get-Module -Name powershell-yaml -ListAvailable)) {
4646
Install-Module powershell-yaml -Repository PSGallery -Scope CurrentUser -Force
4747
}
4848

49-
# Set NODE max memory to 8 Gb.
50-
$ENV:NODE_OPTIONS='--max-old-space-size=8192'
49+
# Set NODE max heap size to 32 Gb. This is assuming the VM has this memory.
50+
$ENV:NODE_OPTIONS='--max-old-space-size=32768'
5151
$ModulePrefix = "Microsoft.Graph"
5252
$ScriptRoot = $PSScriptRoot
5353
$ModulesOutputDir = Join-Path $ScriptRoot "..\src\"

0 commit comments

Comments
 (0)