Skip to content

Commit 8e6f958

Browse files
grendellogrendello
committed
Merge branch 'main' into no-ndk-lib-stubs
* main: (22 commits) Bump to dotnet/installer@632ddca 8.0.100-preview.3.23128.1 (dotnet#7836) LEGO: Merge pull request 7852 [ci] Reduce overhead for MSBuildIntegration unit test jobs. (dotnet#7832) [ci] Allow dynamic`$(NuGetArtifactName)` values (dotnet#7848) [Xamarin.Android.Build.Tasks] guard `AutoImport.props` against empty values (dotnet#7837) [Mono.Android] Print type & member remapping info (dotnet#7844) [Mono.Android] Tweak AndroidMessageHandler behavior for WCF support (dotnet#7785) LEGO: Merge pull request 7845 Localized file check-in by OneLocBuild Task (dotnet#7842) [ci] Use compliance stage template (dotnet#7818) [build] pass `--skip-sign-check` to `dotnet workload` (dotnet#7840) Replace K4os.Hash.xxHash with System.IO.Hashing (dotnet#7831) $(AndroidPackVersionSuffix)=preview.3; net8 is 34.0.0-preview.3 (dotnet#7839) [Xamarin.Android.Build.Tasks] Remove support for mkbundle (dotnet#7772) [Xamarin.Android.Build.Tasks] `unable to open file as zip archive`? (dotnet#7759) [monodroid] Properly process satellite assemblies (dotnet#7823) Bump to xamarin/java.interop/main@77800dda (dotnet#7824) [ci] Use AZDO built-in parallelization strategy. (dotnet#7804) Bump to dotnet/installer@e3ab0b5 8.0.100-preview.2.23123.10 (dotnet#7813) [ci] Run nunit tests with stable .NET version (dotnet#7826) ...
2 parents 64e5fb6 + e7db44e commit 8e6f958

File tree

121 files changed

+1341
-1120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+1341
-1120
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@50faac94c6a0c27864564829ac83f3988c82f8ef
1+
xamarin/monodroid:main@602aca98245744882a129206b79b5a5e093dae44
22
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d

‎Configuration.props‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
<AndroidSupportedTargetJitAbis Condition=" '$(AndroidSupportedTargetJitAbis)' == '' ">armeabi-v7a:arm64-v8a:x86:x86_64</AndroidSupportedTargetJitAbis>
110110
<JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
111111
<MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
112-
<MonoDarwinPackageUrl>https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/151/c633fe923832f0c3db3c4e6aa98e5592bf5a06e7/MonoFramework-MDK-6.12.0.145.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
113-
<MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.12.0.145</MonoRequiredMinimumVersion>
112+
<MonoDarwinPackageUrl>https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.188.macos10.xamarin.universal.pkg</MonoDarwinPackageUrl>
113+
<MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.12.0.188</MonoRequiredMinimumVersion>
114114
<MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">$(MonoRequiredMinimumVersion)</MonoRequiredMaximumVersion>
115115
<IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' And '$(RunningOnCI)' == 'true' ">False</IgnoreMaxMonoVersion>
116116
<IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
@@ -155,8 +155,7 @@
155155
<PathSeparator>$([System.IO.Path]::PathSeparator)</PathSeparator>
156156
<_TestsAotName Condition=" '$(AotAssemblies)' == 'true' ">-Aot</_TestsAotName>
157157
<_TestsProfiledAotName Condition=" '$(AndroidEnableProfiledAot)' == 'true' ">-Profiled</_TestsProfiledAotName>
158-
<_TestsBundleName Condition=" '$(BundleAssemblies)' == 'true' ">-Bundle</_TestsBundleName>
159-
<TestsFlavor>$(_TestsProfiledAotName)$(_TestsAotName)$(_TestsBundleName)</TestsFlavor>
158+
<TestsFlavor>$(_TestsProfiledAotName)$(_TestsAotName)</TestsFlavor>
160159
</PropertyGroup>
161160
<PropertyGroup>
162161
<MingwCommandPrefix32>i686-w64-mingw32</MingwCommandPrefix32>

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
* Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
3636
-->
3737
<AndroidPackVersion>34.0.0</AndroidPackVersion>
38-
<AndroidPackVersionSuffix>preview.2</AndroidPackVersionSuffix>
38+
<AndroidPackVersionSuffix>preview.3</AndroidPackVersionSuffix>
3939
</PropertyGroup>
4040

4141
<!-- Common <PackageReference/> versions -->
4242
<PropertyGroup>
43-
<LibZipSharpVersion>2.0.7</LibZipSharpVersion>
43+
<LibZipSharpVersion>2.1.0</LibZipSharpVersion>
4444
<MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
4545
<MonoCecilVersion>0.11.4</MonoCecilVersion>
4646
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>

‎Documentation/guides/messages/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ or 'Help->Report a Problem' in Visual Studio for Mac.
134134
+ [XA1031](xa1031.md): The 'AndroidHttpClientHandlerType' has an invalid value.
135135
+ [XA1032](xa1032.md):Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.
136136
+ [XA1033](xa1033.md): Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.
137+
+ [XA1035](xa1035.md): The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.
137138

138139
## XA2xxx: Linker
139140

‎Documentation/guides/messages/xa1035.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
title: Xamarin.Android warning XA1035
3+
description: XA1034 warning code
4+
ms.date: 13/12/2022
5+
---
6+
# Xamarin.Android warning XA1035
7+
8+
## Example messages
9+
10+
```
11+
The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.
12+
```
13+
14+
## Solution
15+
16+
Edit your csproj directly and remove the 'BundleAssemblies' property.
17+
`AndroidUseAssemblyStore` and `AndroidEnableAssemblyCompression` are
18+
both enabled by default and, together, they implement behavior
19+
equivalent to that of `BundleAssemblies`.

‎Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,15 @@
711711
</Str>
712712
<Disp Icon="Str" />
713713
</Item>
714+
<Item ItemId=";XA1035" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
715+
<Str Cat="Text">
716+
<Val><![CDATA[The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.]]></Val>
717+
<Tgt Cat="Text" Stat="Loc" Orig="New">
718+
<Val><![CDATA[Vlastnost BundleAssemblies je zastaralá a nemá žádný vliv na sestavení aplikace. Ekvivalentní funkce jsou implementovány vlastnostmi AndroidUseAssemblyStore a AndroidEnableAssemblyCompression.]]></Val>
719+
</Tgt>
720+
</Str>
721+
<Disp Icon="Str" />
722+
</Item>
714723
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
715724
<Str Cat="Text">
716725
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

‎Localize/loc/de/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,15 @@
711711
</Str>
712712
<Disp Icon="Str" />
713713
</Item>
714+
<Item ItemId=";XA1035" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
715+
<Str Cat="Text">
716+
<Val><![CDATA[The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.]]></Val>
717+
<Tgt Cat="Text" Stat="Loc" Orig="New">
718+
<Val><![CDATA[Die Eigenschaft „BundleAssemblies“ ist veraltet und hat keine Auswirkungen auf den Anwendungs-Build. Die entsprechende Funktionalität wird durch die Eigenschaften „AndroidUseAssemblyStore“ und „AndroidEnableAssemblyCompression“ implementiert.]]></Val>
719+
</Tgt>
720+
</Str>
721+
<Disp Icon="Str" />
722+
</Item>
714723
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
715724
<Str Cat="Text">
716725
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

‎Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,15 @@
711711
</Str>
712712
<Disp Icon="Str" />
713713
</Item>
714+
<Item ItemId=";XA1035" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
715+
<Str Cat="Text">
716+
<Val><![CDATA[The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.]]></Val>
717+
<Tgt Cat="Text" Stat="Loc" Orig="New">
718+
<Val><![CDATA[La propiedad "BundleAssemblies" está en desuso y no tiene ningún efecto en la compilación de la aplicación. Las propiedades "AndroidUseAssemblyStore" y "AndroidEnableAssemblyCompression" implementan una funcionalidad equivalente.]]></Val>
719+
</Tgt>
720+
</Str>
721+
<Disp Icon="Str" />
722+
</Item>
714723
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
715724
<Str Cat="Text">
716725
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

‎Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,15 @@
711711
</Str>
712712
<Disp Icon="Str" />
713713
</Item>
714+
<Item ItemId=";XA1035" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
715+
<Str Cat="Text">
716+
<Val><![CDATA[The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.]]></Val>
717+
<Tgt Cat="Text" Stat="Loc" Orig="New">
718+
<Val><![CDATA[La propriété « BundleAssemblies » est déconseillée et n’a aucun effet sur la build de l’application. La fonctionnalité équivalente est implémentée par les propriétés « AndroidUseAssemblyStore » et « AndroidEnableAssemblyCompression ».]]></Val>
719+
</Tgt>
720+
</Str>
721+
<Disp Icon="Str" />
722+
</Item>
714723
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
715724
<Str Cat="Text">
716725
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

‎Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,15 @@
711711
</Str>
712712
<Disp Icon="Str" />
713713
</Item>
714+
<Item ItemId=";XA1035" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
715+
<Str Cat="Text">
716+
<Val><![CDATA[The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.]]></Val>
717+
<Tgt Cat="Text" Stat="Loc" Orig="New">
718+
<Val><![CDATA[La proprietà 'BundleAssemblies' è deprecata e non ha alcun effetto sul build dell'applicazione. La funzione equivalente è implementata dalle proprietà 'AndroidUseAssemblyStore' e 'AndroidEnableAssemblyCompression'.]]></Val>
719+
</Tgt>
720+
</Str>
721+
<Disp Icon="Str" />
722+
</Item>
714723
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
715724
<Str Cat="Text">
716725
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

0 commit comments

Comments
 (0)