Skip to content

Commit 13bb24a

Browse files
committed
Merge branch 'main' into dev/grendel/assembly-blobs-per-rid
* main: [build] Remove classic components from .NET packages (#8464) [tests] assert that Designer Assembly is not packaged. (#8467)
2 parents ddab60b + b830f57 commit 13bb24a

File tree

7 files changed

+6
-103
lines changed

7 files changed

+6
-103
lines changed

.external

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
xamarin/monodroid:main@47bdaaa9b8ac16d6197a8982c8cc810d177c5cff
1+
xamarin/monodroid:main@4d3ede83f699e1d127fed4a18de992819983d715
22
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d

build-tools/create-packs/Microsoft.Android.Sdk.proj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ core workload SDK packs imported by WorkloadManifest.targets.
1414
<PackageId>Microsoft.Android.Sdk.$(HostOS)</PackageId>
1515
<Description>C# Tools and Bindings for the Android SDK.</Description>
1616
<Description Condition=" '$(HostOS)' == 'Linux' ">$(Description) Please note that this package is not officially supported, and has not received extensive testing.</Description>
17-
<!-- Exclude mono bundle components declared in `create-installers.targets`. -->
18-
<IncludeMonoBundleComponents>false</IncludeMonoBundleComponents>
1917
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2018
</PropertyGroup>
2119

@@ -30,8 +28,8 @@ core workload SDK packs imported by WorkloadManifest.targets.
3028
<Target Name="_GenerateXASdkContent"
3129
DependsOnTargets="ConstructInstallerItems;_GetLicense">
3230
<ItemGroup>
33-
<AndroidSdkBuildTools Include="@(MSBuildItemsWin)" PackagePath="tools\$([System.IO.Path]::GetDirectoryName('%(MSBuildItemsWin.RelativePath)'))" Condition=" '%(MSBuildItemsWin.ExcludeFromAndroidNETSdk)' != 'true' and '$(HostOS)' == 'Windows' " />
34-
<AndroidSdkBuildTools Include="@(MSBuildItemsUnix)" PackagePath="tools\$([System.IO.Path]::GetDirectoryName('%(MSBuildItemsUnix.RelativePath)'))" Condition=" '%(MSBuildItemsUnix.ExcludeFromAndroidNETSdk)' != 'true' and ('$(HostOS)' == 'Linux' or '$(HostOS)' == 'Darwin') " />
31+
<AndroidSdkBuildTools Include="@(MSBuildItemsWin)" PackagePath="tools\$([System.IO.Path]::GetDirectoryName('%(MSBuildItemsWin.RelativePath)'))" Condition=" '$(HostOS)' == 'Windows' " />
32+
<AndroidSdkBuildTools Include="@(MSBuildItemsUnix)" PackagePath="tools\$([System.IO.Path]::GetDirectoryName('%(MSBuildItemsUnix.RelativePath)'))" Condition=" '$(HostOS)' == 'Linux' or '$(HostOS)' == 'Darwin' " />
3533
</ItemGroup>
3634

3735
<GenerateUnixFilePermissions

build-tools/create-packs/SignList.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<ItemGroup>
88
<ThirdParty Include="HtmlAgilityPack.dll" />
9-
<ThirdParty Include="ICSharpCode.SharpZipLib.dll" />
109
<ThirdParty Include="INIFileParser.dll" />
1110
<ThirdParty Include="Irony.dll" />
1211
<ThirdParty Include="K4os.Compression.LZ4.dll" />

build-tools/installers/create-installers.targets

Lines changed: 0 additions & 92 deletions
Large diffs are not rendered by default.

build-tools/installers/sign-content.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ourself (using an empty signing identity) before passing these files to ESRP.
3737

3838
<Target Name="AddMSBuildFilesUnixSign" >
3939
<ItemGroup>
40-
<FilesToSign Include="@(_MSBuildFilesUnixSign)" Condition=" '%(_MSBuildFilesUnixSign.ExcludeFromAndroidNETSdk)' != 'true' ">
40+
<FilesToSign Include="@(_MSBuildFilesUnixSign)">
4141
<Authenticode>MacDeveloperVNext</Authenticode>
4242
<Zip>true</Zip>
4343
</FilesToSign>
@@ -46,7 +46,7 @@ ourself (using an empty signing identity) before passing these files to ESRP.
4646

4747
<Target Name="AddMSBuildFilesUnixSignAndHarden" >
4848
<ItemGroup>
49-
<FilesToSign Include="@(_MSBuildFilesUnixSignAndHarden)" Condition=" '%(_MSBuildFilesUnixSignAndHarden.ExcludeFromAndroidNETSdk)' != 'true' ">
49+
<FilesToSign Include="@(_MSBuildFilesUnixSignAndHarden)">
5050
<Authenticode>MacDeveloperVNextHarden</Authenticode>
5151
<Zip>true</Zip>
5252
</FilesToSign>

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ public String Say (String quote) {
141141
nupkg.AssertDoesNotContainEntry (nupkgPath, "content/nopack.aar");
142142
nupkg.AssertDoesNotContainEntry (nupkgPath, $"contentFiles/any/{dotnetVersion}-android{apiLevel}.0/nopack.aar");
143143
nupkg.AssertContainsEntry (nupkgPath, $"lib/{dotnetVersion}-android{apiLevel}.0/baz.aar");
144+
nupkg.AssertDoesNotContainEntry (nupkgPath, $"lib/{dotnetVersion}-android{apiLevel}.0/_Microsoft.Android.Resource.Designer.dll");
144145
}
145146

146147
static readonly object[] DotNetTargetFrameworks = new object[] {

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<Reference Include="Mono.CompilerServices.SymbolWriter.dll">
27-
<HintPath>$(MicrosoftAndroidSdkOutDir)Mono.CompilerServices.SymbolWriter.dll</HintPath>
28-
</Reference>
2926
<Reference Include="Xamarin.Android.Cecil">
3027
<HintPath>$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Cecil.dll</HintPath>
3128
</Reference>

0 commit comments

Comments
 (0)