Skip to content

Commit 47d2875

Browse files
authored
Add network isolation policy to pipeline settings (#1477)
* Add network isolation policy to pipeline settings * Update Android SDK URLs to use native asset storage * Update Android SDK URLs to use asset storage variables
1 parent 5b57221 commit 47d2875

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ resources:
2323
extends:
2424
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
2525
parameters:
26+
settings:
27+
networkIsolationPolicy: Permissive,CFSClean
2628
sdl:
2729
tsa:
2830
enabled: true

src/Microsoft.DotNet.XHarness.CLI/Microsoft.DotNet.XHarness.CLI.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="../../tests/integration-tests/Storage.props"/>
23

34
<PropertyGroup>
45
<OutputType>Exe</OutputType>
@@ -16,13 +17,13 @@
1617
<!-- When updating these URLs, avoid using 'latest' url as these are redirects and can make the same commit build differently on different days -->
1718
<AndroidSdkVersion>32.0.0</AndroidSdkVersion>
1819

19-
<WindowsAndroidSdkUrl>https://dl.google.com/android/repository/platform-tools_r$(AndroidSdkVersion)-windows.zip</WindowsAndroidSdkUrl>
20+
<WindowsAndroidSdkUrl>$(AssetsBaseUri)/android/windows-android-platform-tools_r$(AndroidSdkVersion).zip</WindowsAndroidSdkUrl>
2021
<WindowsAndroidSdkFileName>windows-android-platform-tools.zip</WindowsAndroidSdkFileName>
2122

22-
<LinuxAndroidSdkUrl>https://dl.google.com/android/repository/platform-tools_r$(AndroidSdkVersion)-linux.zip</LinuxAndroidSdkUrl>
23+
<LinuxAndroidSdkUrl>$(AssetsBaseUri)/android/linux-android-platform-tools_r$(AndroidSdkVersion).zip</LinuxAndroidSdkUrl>
2324
<LinuxAndroidSdkFileName>linux-android-platform-tools.zip</LinuxAndroidSdkFileName>
2425

25-
<MacOsAndroidSdkUrl>https://dl.google.com/android/repository/platform-tools_r$(AndroidSdkVersion)-darwin.zip</MacOsAndroidSdkUrl>
26+
<MacOsAndroidSdkUrl>$(AssetsBaseUri)/android/macos-android-platform-tools_r$(AndroidSdkVersion).zip</MacOsAndroidSdkUrl>
2627
<MacOsAndroidSdkFileName>macos-android-platform-tools.zip</MacOsAndroidSdkFileName>
2728
</PropertyGroup>
2829

0 commit comments

Comments
 (0)