Skip to content

Commit ac8d0ee

Browse files
authored
[ci] Move PR build to dnceng public (#249)
New pipeline: https://dev.azure.com/dnceng-public/public/_build?definitionId=307
1 parent 36e574c commit ac8d0ee

File tree

2 files changed

+3
-77
lines changed

2 files changed

+3
-77
lines changed

azure-pipelines.yaml

Lines changed: 2 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,10 @@ pr:
88
- main
99
- release/*
1010

11-
parameters:
12-
- name: ApiScanSourceBranch
13-
default: refs/heads/main
14-
1511
# Global variables
1612
variables:
1713
- name: DotNetCoreVersion
18-
value: 6.0.x
14+
value: 9.0.x
1915

2016
jobs:
2117
- job: build
@@ -24,10 +20,9 @@ jobs:
2420
strategy:
2521
matrix:
2622
macOS:
27-
vmImage: macOS-13
23+
vmImage: macOS-15
2824
windows:
2925
vmImage: windows-2022
30-
Codeql.Enabled: true
3126
pool:
3227
vmImage: $(vmImage)
3328
workspace:
@@ -41,11 +36,6 @@ jobs:
4136
inputs:
4237
version: $(DotNetCoreVersion)
4338

44-
- task: UseDotNet@2
45-
displayName: Use .NET Core 8.0.x
46-
inputs:
47-
version: 8.0.x
48-
4939
- task: DotNetCoreCLI@2
5040
displayName: Build solution Xamarin.Android.Tools.sln
5141
inputs:
@@ -87,68 +77,3 @@ jobs:
8777
path: $(Build.ArtifactStagingDirectory)
8878
artifactName: Artifacts - $(System.JobName)
8979
condition: always()
90-
91-
- job: api_scan
92-
displayName: API Scan
93-
dependsOn: build
94-
condition: false
95-
#condition: and(eq(dependencies.build.result, 'Succeeded'), eq(variables['Build.SourceBranch'], '${{ parameters.ApiScanSourceBranch }}'))
96-
pool:
97-
name: Azure Pipelines
98-
vmImage: windows-2022
99-
timeoutInMinutes: 480
100-
workspace:
101-
clean: all
102-
steps:
103-
- task: DownloadPipelineArtifact@2
104-
displayName: Download build artifacts
105-
inputs:
106-
artifactName: Output - windows
107-
downloadPath: $(Build.SourcesDirectory)
108-
109-
- task: CopyFiles@2
110-
displayName: Collect Files for APIScan
111-
inputs:
112-
Contents: |
113-
$(Build.SourcesDirectory)\**\?(*.dll|*.exe|*.pdb)
114-
!$(Build.SourcesDirectory)\**\ls-jdks.*
115-
TargetFolder: $(Build.StagingDirectory)\apiscan
116-
OverWrite: true
117-
flattenFolders: true
118-
119-
- powershell: Get-ChildItem -Path "$(Build.StagingDirectory)\apiscan" -Recurse
120-
displayName: List Files for APIScan
121-
122-
- task: APIScan@2
123-
displayName: Run APIScan
124-
inputs:
125-
softwareFolder: $(Build.StagingDirectory)\apiscan
126-
symbolsFolder: 'SRV*http://symweb;$(Build.StagingDirectory)\apiscan'
127-
softwareName: $(ApiScanName)
128-
softwareVersionNum: $(Build.SourceBranchName)-$(Build.SourceVersion)$(System.JobAttempt)
129-
isLargeApp: true
130-
toolVersion: Latest
131-
env:
132-
AzureServicesAuthConnectionString: runAs=App;AppId=$(ApiScanClientId);TenantId=$(ApiScanTenant);AppKey=$(ApiScanSecret)
133-
134-
- task: SdtReport@2
135-
displayName: Guardian Export - Security Report
136-
inputs:
137-
GdnExportAllTools: false
138-
GdnExportGdnToolApiScan: true
139-
GdnExportOutputSuppressionFile: source.gdnsuppress
140-
141-
- task: PublishSecurityAnalysisLogs@3
142-
displayName: Publish Guardian Artifacts
143-
inputs:
144-
ArtifactName: APIScan Logs
145-
ArtifactType: Container
146-
AllTools: false
147-
APIScan: true
148-
ToolLogsNotFoundAction: Warning
149-
150-
- task: PostAnalysis@2
151-
displayName: Fail Build on Guardian Issues
152-
inputs:
153-
GdnBreakAllTools: false
154-
GdnBreakGdnToolApiScan: true

tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<IsPackable>false</IsPackable>
1111
<OutputPath>$(TestOutputFullPath)</OutputPath>
1212
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
13+
<RollForward>Major</RollForward>
1314
</PropertyGroup>
1415

1516
<ItemGroup>

0 commit comments

Comments
 (0)