Skip to content

Commit 745214d

Browse files
dotnet-maestro[bot]jonathanpepperspjcollins
authored
Bump to dotnet/installer@c7afae69 7.0.100-preview.4.22174.1 (dotnet#6598)
Context: dotnet/runtime#56989 Context: dotnet/runtime#68734 Context: dotnet/runtime#68914 Context: dotnet/runtime#68701 Changes: dotnet/installer@04e40fa...c7afae6 % git diff --shortstat 04e40fa9...c7afae69 98 files changed, 1788 insertions(+), 1191 deletions(-) Changes: dotnet/runtime@a21b9a2...c5d40c9 % git diff --shortstat a21b9a2d...c5d40c9e 28347 files changed, 1609359 insertions(+), 1066473 deletions(-) Changes: dotnet/linker@01c4f59...04c49c9 % git diff --shortstat 01c4f590...04c49c9d 577 files changed, 28039 insertions(+), 10835 deletions(-) Updates to build with the .NET 7 SDK and use the runtime specified by the SDK. We no longer use different SDK & runtime versions. This produces a 7.0.100 Android workload. After this is merged we should be able to enable Maestro to consume future .NET 7 builds from dotnet/installer/main. ~~ Known Issues ~~ AOT+LLVM crashes on startup: * dotnet/runtime#68914 Xamarin.Build.Download hits a breaking change with `ZipEntry`: * dotnet/runtime#68734 * xamarin/XamarinComponents#1368 illink outputs different MVIDs per architecture: * dotnet/linker#2203 * dotnet/runtime#67660 Size of `libmonosgen-2.0.so` regressed: * dotnet/runtime#68330 * dotnet/runtime#68354 Newer .NET 7 builds crash on startup: * dotnet/runtime#68701 * This is worked around by *disabling* lazy loading of AOT'd assemblies 6dc426f. * TODO: re-enable once we get a fixed .NET 7 runtime. TODO: We can't yet push to the `dotnet7` feed. Working on this. Co-authored-by: Jonathan Peppers <[email protected]> Co-authored-by: Peter Collins <[email protected]>
1 parent 1fa74d1 commit 745214d

35 files changed

+207
-159
lines changed

‎Configuration.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">Tiramisu</AndroidLatestUnstablePlatformId>
3939
<AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v12.1.99</AndroidLatestUnstableFrameworkVersion>
4040
<!-- The default API level used for $(TargetPlatformVersion) -->
41-
<AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">31</AndroidDefaultTargetDotnetApiLevel>
41+
<AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">32</AndroidDefaultTargetDotnetApiLevel>
4242
<!-- The API level and TargetFrameworkVersion for the default Mono.Android.dll build -->
4343
<AndroidApiLevel Condition=" '$(AndroidApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidApiLevel>
4444
<AndroidPlatformId Condition=" '$(AndroidPlatformId)' == '' ">$(AndroidLatestStablePlatformId)</AndroidPlatformId>

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<DotNetTargetFrameworkVersion>6.0</DotNetTargetFrameworkVersion>
4+
<DotNetTargetFrameworkVersion>7.0</DotNetTargetFrameworkVersion>
55
<DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
66
<DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
77
<!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->

‎NuGet.config

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<!-- Begin: Package sources from dotnet-emsdk -->
7-
<!-- End: Package sources from dotnet-emsdk -->
8-
<!-- Begin: Package sources from dotnet-runtime -->
9-
<add key="darc-pub-dotnet-runtime-a21b9a2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-a21b9a2d/nuget/v3/index.json" />
10-
<!-- End: Package sources from dotnet-runtime -->
11-
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
125
<!-- ensure only the sources defined below are used -->
136
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
147
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
15-
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
8+
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
169
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
1710
<!-- Android binary, to support delta APK install -->
1811
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />

‎build-tools/automation/azure-pipelines.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ variables:
5353
value: $[and(ne(variables['System.PullRequest.IsFork'], 'True'), or(contains(variables['Build.SourceBranchName'], 'mono-'), contains(variables['System.PullRequest.SourceBranch'], 'mono-')))]
5454
- name: RunAllTests
5555
value: $[or(eq(variables['XA.RunAllTests'], true), eq(variables['IsMonoBranch'], true))]
56+
# XamarinBuildDownload disabled, due to: https://github.com/dotnet/runtime/issues/68734
5657
- name: DotNetNUnitCategories
57-
value: '& TestCategory != DotNetIgnore & TestCategory != HybridAOT & TestCategory != MkBundle & TestCategory != MonoSymbolicate & TestCategory != PackagesConfig & TestCategory != StaticProject & TestCategory != Debugger & TestCategory != SystemApplication'
58+
value: '& TestCategory != DotNetIgnore & TestCategory != HybridAOT & TestCategory != MkBundle & TestCategory != MonoSymbolicate & TestCategory != PackagesConfig & TestCategory != StaticProject & TestCategory != Debugger & TestCategory != SystemApplication & TestCategory != XamarinBuildDownload'
5859
- ${{ if eq(variables['Build.DefinitionName'], 'Xamarin.Android-Private') }}:
5960
- group: AzureDevOps-Artifact-Feeds-Pats
6061
- group: DotNet-MSRC-Storage
@@ -697,6 +698,8 @@ stages:
697698

698699
- template: yaml-templates/apk-instrumentation.yaml
699700
parameters:
701+
# TODO: disable LLVM test, see: https://github.com/dotnet/runtime/issues/68914
702+
condition: false
700703
configuration: $(XA.Build.Configuration)
701704
testName: Mono.Android.NET_Tests-AotLlvm
702705
project: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
@@ -1434,7 +1437,9 @@ stages:
14341437
packagesToPush: $(Build.StagingDirectory)\nuget-signed\*.nupkg
14351438
nuGetFeedType: external
14361439
publishFeedCredentials: $(DotNetFeedCredential)
1437-
condition: and(succeeded(), eq(variables['PushXAPackages'], 'true'))
1440+
condition: false
1441+
# NET7TODO: Enable once we have access to the dnceng-dotnet7 feed.
1442+
#condition: and(succeeded(), eq(variables['PushXAPackages'], 'true'))
14381443

14391444
- template: templates\common\upload-vs-insertion-artifacts.yml@sdk-insertions
14401445
parameters:

‎build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@ jobs:
2626

2727
- template: clean.yaml
2828

29+
# Install a stable verison of .NET for classic tests
30+
- template: use-dot-net.yaml
31+
parameters:
32+
version: 6.0.202
33+
remove_dotnet: true
34+
2935
- template: setup-test-environment.yaml
3036
parameters:
3137
provisionatorChannel: ${{ parameters.provisionatorChannel }}
32-
remove_dotnet: true
3338

3439
- task: DownloadPipelineArtifact@1
3540
inputs:

‎build-tools/automation/yaml-templates/use-dot-net.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# We prefer this over the UseDotNet task so that we can always clean up old/unstable versions on disk.
33

44
parameters:
5-
version: $(DotNet6Version)
5+
version: $(DotNetSdkVersion)
66
remove_dotnet: false
77

88
steps:

‎build-tools/automation/yaml-templates/variables.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ variables:
1717
value: 3.11.1
1818
- name: NUnit.NumberOfTestWorkers
1919
value: 4
20-
- name: DotNet6Version
21-
value: 6.0.100
20+
- name: DotNetSdkVersion
21+
value: 7.0.100-preview.2.22153.17
2222
- name: GitHub.Token
2323
value: $(github--pat--vs-mobiletools-engineering-service2)
2424
- name: HostedMacImage
@@ -32,6 +32,6 @@ variables:
3232
- name: TeamName
3333
value: XamarinAndroid
3434
- name: DotNetTargetFramework
35-
value: net6.0
35+
value: net7.0
3636
- name: DotNetStableTargetFramework
3737
value: net6.0

‎build-tools/create-packs/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<_WLManifest Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.NET.Sdk.Android.Manifest-*.nupkg" />
9696
</ItemGroup>
9797
<PropertyGroup>
98-
<_WLPackVersion>@(_WLManifest->'%(Filename)'->Replace('Microsoft.NET.Sdk.Android.Manifest-$(DotNetPreviewVersionBand).', ''))</_WLPackVersion>
98+
<_WLPackVersion>@(_WLManifest->'%(Filename)'->Replace('Microsoft.NET.Sdk.Android.Manifest-$(DotNetAndroidManifestVersionBand).', ''))</_WLPackVersion>
9999
<_SdkManifestsFolder>$(DotNetPreviewPath)sdk-manifests\$(DotNetSdkManifestsFolder)\</_SdkManifestsFolder>
100100
</PropertyGroup>
101101
<Unzip

‎build-tools/create-packs/Microsoft.Android.Ref.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ by projects that use the Microsoft.Android framework in .NET 5.
3131
</PropertyGroup>
3232

3333
<ItemGroup>
34+
<!-- TODO: build Java.Interop.dll for .NET 7 -->
3435
<_AndroidRefPackAssemblies Include="$(JavaInteropSourceDirectory)\bin\$(Configuration)-net6.0\ref\Java.Interop.dll" />
3536
<_AndroidRefPackAssemblies Include="$(_MonoAndroidNETOutputRoot)$(DotNetAndroidTargetFramework)$(AndroidApiLevel)\ref\Mono.Android.dll" />
3637
<!-- Always include stable Mono.Android.Export.dll -->

‎build-tools/create-packs/Microsoft.Android.Runtime.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ projects that use the Microsoft.Android framework in .NET 5.
3434
</PropertyGroup>
3535

3636
<ItemGroup>
37+
<!-- TODO: build Java.Interop.dll for .NET 7 -->
3738
<_AndroidRuntimePackAssemblies Include="$(JavaInteropSourceDirectory)\bin\$(Configuration)-net6.0\Java.Interop.dll" />
3839
<_AndroidRuntimePackAssemblies Include="$(_MonoAndroidNETOutputRoot)$(DotNetAndroidTargetFramework)$(AndroidApiLevel)\Mono.Android.dll" />
3940
<!-- Always include stable Mono.Android.Export.dll -->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.300-rtm.22214.7">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.4.22174.1">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>04e40fa940291c528688bb46a1aa0e6efdbab7cf</Sha>
5+
<Sha>c7afae6936bf80239aa93bfd3b6f68513d9876d4</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22178.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22173.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>01c4f5905959c29f86781b85187bb676fc517ee9</Sha>
9+
<Sha>04c49c9d7c244d7c73d6dbb438c4885fa72e830b</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.5">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.4.22172.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>a21b9a2dd4c31cf5bd37626562b7612faf21cee6</Sha>
13+
<Sha>c5d40c9e703fd257db1b26ef4fd1399bbae73ab0</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.3.22121.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
17+
<Sha>b8e71431b3eaa024afad7886699f8ac6bca2ba01</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>6.0.300-rtm.22214.7</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22178.2</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>6.0.5</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.4.22174.1</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22173.2</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.4.22172.7</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>
10-
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
9+
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.3.22121.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
10+
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<!-- Match the first three version numbers and append 00 -->

‎src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0-android</TargetFramework>
3+
<TargetFramework>net7.0-android</TargetFramework>
44
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
55
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidBinding1</RootNamespace>
66
<Nullable>enable</Nullable>

‎src/Microsoft.Android.Templates/android/AndroidApp1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0-android</TargetFramework>
3+
<TargetFramework>net7.0-android</TargetFramework>
44
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
55
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidApp1</RootNamespace>
66
<OutputType>Exe</OutputType>

‎src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0-android</TargetFramework>
3+
<TargetFramework>net7.0-android</TargetFramework>
44
<SupportedOSPlatformVersion>SUPPORTED_OS_PLATFORM_VERSION</SupportedOSPlatformVersion>
55
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">AndroidLib1</RootNamespace>
66
<Nullable>enable</Nullable>

‎src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/in/Microsoft.Android.Sdk.BundledVersions.in.targets

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
1717
<_AndroidRuntimePackId Condition=" '$(_AndroidRuntimePackId)' == '' ">$(_AndroidTargetingPackId)</_AndroidRuntimePackId>
1818
</PropertyGroup>
1919
<ItemGroup>
20+
<!-- TODO: NET7TODO: Is this the right way to support building net6.0 projects? Need to bump versions as packages are release to NuGet.org as well -->
21+
<KnownFrameworkReference
22+
Include="Microsoft.Android"
23+
TargetFramework="net6.0"
24+
RuntimeFrameworkName="Microsoft.Android"
25+
LatestRuntimeFrameworkVersion="32.0.300-rc.1.4"
26+
TargetingPackName="Microsoft.Android.Ref.$(_AndroidTargetingPackId)"
27+
TargetingPackVersion="32.0.300-rc.1.4"
28+
RuntimePackNamePatterns="Microsoft.Android.Runtime.$(_AndroidRuntimePackId).**RID**"
29+
RuntimePackRuntimeIdentifiers="android-arm;android-arm64;android-x86;android-x64"
30+
Profile="Android"
31+
/>
2032
<KnownFrameworkReference
2133
Include="Microsoft.Android"
2234
TargetFramework="@DOTNET_TARGET_FRAMEWORK@"

‎src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ This file contains the .NET 5-specific targets to customize ILLink
1414
AfterTargets="ComputeResolvedFilesToPublishList"
1515
DependsOnTargets="GetReferenceAssemblyPaths;_CreatePropertiesCache">
1616
<PropertyGroup>
17+
<TrimmerRemoveSymbols Condition=" '$(AndroidIncludeDebugSymbols)' != 'true' ">true</TrimmerRemoveSymbols>
1718
<!--
1819
Used for the <ILLink DumpDependencies="$(_TrimmerDumpDependencies)" /> value:
1920
https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L150

‎src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"description": ".NET SDK Workload for building Android applications.",
66
"packs": [
77
"Microsoft.Android.Sdk",
8-
"Microsoft.Android.Ref.31",
98
"Microsoft.Android.Ref.32",
109
"Microsoft.Android.Runtime.32.android-arm",
1110
"Microsoft.Android.Runtime.32.android-arm64",
@@ -41,10 +40,6 @@
4140
"linux-x64": "Microsoft.Android.Sdk.Linux"
4241
}
4342
},
44-
"Microsoft.Android.Ref.31": {
45-
"kind": "framework",
46-
"version": "@WORKLOAD_VERSION@"
47-
},
4843
"Microsoft.Android.Ref.32": {
4944
"kind": "framework",
5045
"version": "@WORKLOAD_VERSION@"

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ public void RepetiviteBuildUpdateSingleResource ([Values (false, true)] bool use
256256
}
257257

258258
[Test]
259+
[Category ("XamarinBuildDownload")]
259260
[NonParallelizable]
260261
public void Check9PatchFilesAreProcessed ()
261262
{

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ public void BuildAotApplicationAndBundleAndÜmläüts (string supportedAbis, boo
296296

297297
[Test]
298298
[NonParallelizable]
299-
[Category ("SmokeTests")]
299+
[Category ("SmokeTests"), Category ("XamarinBuildDownload")]
300300
public void BuildAMassiveApp ()
301301
{
302302
var testPath = Path.Combine ("temp", "BuildAMassiveApp");

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@ public void ApplicationIdPlaceholder ()
551551
}
552552

553553
[Test]
554+
[Category ("XamarinBuildDownload")]
554555
public void ExtraAaptManifest ()
555556
{
556557
var proj = new XamarinAndroidApplicationProject ();

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ public void DuplicateRJavaOutput ()
423423
}
424424

425425
[Test]
426-
[Category ("SmokeTests")]
426+
[Category ("SmokeTests"), Category ("XamarinBuildDownload")]
427427
[NonParallelizable] // parallel NuGet restore causes failures
428428
public void BuildXamarinFormsMapsApplication ([Values (true, false)] bool multidex)
429429
{

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto
9090
"rc.bin",
9191
"System.Private.CoreLib.dll",
9292
"System.Runtime.dll",
93-
"System.Runtime.CompilerServices.Unsafe.dll",
9493
"System.Linq.dll",
9594
"UnnamedProject.dll",
9695
} :

0 commit comments

Comments
 (0)