Skip to content
This repository was archived by the owner on May 15, 2024. It is now read-only.

Commit 48ebfcf

Browse files
jfversluisjfversluis
authored
Merge pull request #2086 from xamarin/fix-2080
Add compliance to buildpipline
2 parents 35c5620 + 450d3a3 commit 48ebfcf

File tree

9 files changed

+423
-5
lines changed

9 files changed

+423
-5
lines changed

‎DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
6262
<PackageReference Include="xunit" Version="2.4.1" />
6363
<PackageReference Include="xunit.runner.devices" Version="2.5.25" />
64-
<PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21620.1" />
64+
<PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23212.1" />
6565
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.0.1" />
6666
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.6" />
6767
</ItemGroup>

‎DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
8181
<PackageReference Include="xunit" Version="2.4.1" />
8282
<PackageReference Include="xunit.runner.devices" Version="2.5.25" />
83-
<PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21620.1" />
83+
<PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23212.1" />
8484
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
8585
</ItemGroup>
8686
<ItemGroup>

‎DeviceTests/DeviceTests.iOS/Info.plist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,9 @@
5757
<string>Access to your location is required for cool things to happen!</string>
5858
<key>NSContactsUsageDescription</key>
5959
<string>Contacts</string>
60+
<key>UIRequiredDeviceCapabilities</key>
61+
<array>
62+
<string>arm64</string>
63+
</array>
6064
</dict>
6165
</plist>

‎DeviceTests/build.cake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
var TARGET = Argument("target", "Default");
77

8-
var IOS_SIM_NAME = Argument("ios-device", EnvironmentVariable("IOS_SIM_NAME") ?? "iPhone 11");
9-
var IOS_SIM_RUNTIME = Argument("ios-runtime", EnvironmentVariable("IOS_SIM_RUNTIME") ?? "com.apple.CoreSimulator.SimRuntime.iOS-14-2");
8+
var IOS_SIM_NAME = Argument("ios-device", EnvironmentVariable("IOS_SIM_NAME") ?? "iPhone 14");
9+
var IOS_SIM_RUNTIME = Argument("ios-runtime", EnvironmentVariable("IOS_SIM_RUNTIME") ?? "ios-simulator-64");
1010
var IOS_PROJ = "./DeviceTests.iOS/DeviceTests.iOS.csproj";
1111
var IOS_BUNDLE_ID = "com.xamarin.essentials.devicetests";
1212
var IOS_IPA_PATH = "./DeviceTests.iOS/bin/iPhoneSimulator/Release/XamarinEssentialsDeviceTestsiOS.app";

‎NuGet.config‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear/>
5+
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
6+
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
7+
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
8+
</packageSources>
9+
<activePackageSource>
10+
<add key="All" value="(Aggregate source)" />
11+
</activePackageSource>
12+
</configuration>

‎azure-pipelines.yml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ variables:
1515
GIT_SHA: $(Build.SourceVersion)
1616
GIT_BRANCH_NAME: $(Build.SourceBranchName)
1717
AREA_PATH: 'DevDiv\Xamarin SDK\Build and Tools'
18+
CAKE_VERSION: '2.1.0'
1819

1920
resources:
2021
repositories:
@@ -36,8 +37,10 @@ stages:
3637
jobs:
3738
- template: .ci/build.v1.yml@components
3839
parameters:
40+
runChecks: false
3941
dotnet: '3.1.415'
4042
dotnetStable: '3.1.415'
43+
cake: '2.1.0'
4144
${{ if eq(variables['System.TeamProject'], 'devdiv') }}: # The AzurePipelines-EO pool is only available in DevDiv
4245
windowsAgentPoolName: AzurePipelines-EO
4346
windowsImage: '' # Override the 'windows-latest' default settings
@@ -92,6 +95,16 @@ stages:
9295
packageFilter: '*.nupkg'
9396
packageVersionRegex: '(?i)^Xamarin.Essentials\.(?<version>\d+\.\d+\.\d+)(.*).nupkg$'
9497

98+
- ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
99+
- template: security/full/v0.yml@internal-templates
100+
parameters:
101+
dependsOn: [ ]
102+
credScanSuppressionFile: $(Build.SourcesDirectory)\build-tools\automation\guardian\CredScanSuppressions.json
103+
sourceGdnSuppressionFile: $(Build.SourcesDirectory)\build-tools\automation\guardian\source.gdnsuppress
104+
tsaConfigFile: $(Build.SourcesDirectory)\build-tools\automation\guardian\tsaoptions-v2.json
105+
policheckExclusionFilesFolder: $(Build.SourcesDirectory)\build-tools\automation\guardian
106+
policheckGdnSuppressionFilesFolder: $(Build.SourcesDirectory)\build-tools\automation\guardian
107+
95108
- ${{ if not(startsWith(variables['Build.SourceBranch'], 'refs/tags/')) }}:
96109
- stage: devicetests
97110
displayName: Device Tests
@@ -124,6 +137,7 @@ stages:
124137

125138
- template: .ci/build.v1.yml@components
126139
parameters:
140+
macosImage: 'macos-12'
127141
name: devicetests_ios
128142
runChecks: false
129143
displayName: iOS
@@ -133,7 +147,9 @@ stages:
133147
verbosity: diagnostic
134148
cakeFile: DeviceTests/build.cake
135149
cakeTarget: test-ios-emu
136-
xharness: '1.0.0-prerelease.21620.1'
150+
cake: $(CAKE_VERSION)
151+
xcode: '14.2'
152+
xharness: '1.0.0-prerelease.23212.1'
137153

138154
- template: .ci/build.v1.yml@components
139155
parameters:
@@ -147,6 +163,7 @@ stages:
147163
cakeFile: DeviceTests/build.cake
148164
cakeTarget: test-android-emu
149165
cakeExtraArgs: --avd-target="`"system-images;android-21;google_apis;x86`""
166+
cake: $(CAKE_VERSION)
150167
preBuildSteps:
151168
- bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-21;google_apis;x86\""
152169
displayName: Install the Android emulators
@@ -163,6 +180,7 @@ stages:
163180
cakeFile: DeviceTests/build.cake
164181
cakeTarget: test-android-emu
165182
cakeExtraArgs: --avd-target="`"system-images;android-22;google_apis;x86`""
183+
cake: $(CAKE_VERSION)
166184
preBuildSteps:
167185
- bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-22;google_apis;x86\""
168186
displayName: Install the Android emulators
@@ -180,6 +198,7 @@ stages:
180198
# cakeFile: DeviceTests/build.cake
181199
# cakeTarget: test-android-emu
182200
# cakeExtraArgs: --avd-target="`"system-images;android-23;google_apis;x86`""
201+
# cake: $(CAKE_VERSION)
183202
# preBuildSteps:
184203
# - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-23;google_apis;x86\""
185204
# displayName: Install the Android emulators
@@ -196,6 +215,7 @@ stages:
196215
cakeFile: DeviceTests/build.cake
197216
cakeTarget: test-android-emu
198217
cakeExtraArgs: --avd-target="`"system-images;android-24;google_apis;x86`""
218+
cake: $(CAKE_VERSION)
199219
preBuildSteps:
200220
- bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-24;google_apis;x86\""
201221
displayName: Install the Android emulators
@@ -212,6 +232,7 @@ stages:
212232
cakeFile: DeviceTests/build.cake
213233
cakeTarget: test-android-emu
214234
cakeExtraArgs: --avd-target="`"system-images;android-26;google_apis;x86`""
235+
cake: $(CAKE_VERSION)
215236
preBuildSteps:
216237
- bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-26;google_apis;x86\""
217238
displayName: Install the Android emulators
@@ -228,6 +249,7 @@ stages:
228249
cakeFile: DeviceTests/build.cake
229250
cakeTarget: test-android-emu
230251
cakeExtraArgs: --avd-target="`"system-images;android-29;google_apis;x86`""
252+
cake: $(CAKE_VERSION)
231253
preBuildSteps:
232254
- bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-29;google_apis;x86\""
233255
displayName: Install the Android emulators
@@ -244,6 +266,7 @@ stages:
244266
# cakeFile: DeviceTests/build.cake
245267
# cakeTarget: test-android-emu
246268
# cakeExtraArgs: --avd-target="`"system-images;android-30;google_apis;x86`""
269+
# cake: $(CAKE_VERSION)
247270
# preBuildSteps:
248271
# - bash: sh -c "echo \"y\" | $ANDROID_HOME/tools/bin/sdkmanager \"system-images;android-30;google_apis;x86\""
249272
# displayName: Install the Android emulators

‎build-tools/automation/guardian/CredScanSuppressions.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"tool": "Credential Scanner",
3+
"suppressions": [
4+
5+
]
6+
}

0 commit comments

Comments
 (0)