Skip to content

Commit 45d9a68

Browse files
committed
Merge branch 'main' into dev/grendel/blobs-in-lib
* main: [build] push .NET 9 packages using `dnceng-dotnet9` (#8560) Bump `xamarin-android-tools` from `bde49e6` to `4889bf0`. (#8545) Localized file check-in by OneLocBuild Task (#8561)
2 parents 54a48eb + e9e85a3 commit 45d9a68

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<TargetFramework>$(TargetFrameworkNETStandard)</TargetFramework>
77
<LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
88
<OutputPath>$(BootstrapOutputDirectory)</OutputPath>
9+
<_IncludeMicrosoftBuildPackage>true</_IncludeMicrosoftBuildPackage>
910
</PropertyGroup>
1011

1112
<Import Project="..\..\Configuration.props" />

build-tools/automation/azure-pipelines.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ variables:
5151
value: dotnet8-internal-dnceng-internal-feed
5252
- ${{ if ne(variables['Build.DefinitionName'], 'Xamarin.Android-Private') }}:
5353
- name: DotNetFeedCredential
54-
value: dnceng-dotnet8
54+
value: dnceng-dotnet9
5555
- ${{ if and(or(eq(variables['Build.DefinitionName'], 'Xamarin.Android'), eq(variables['Build.DefinitionName'], 'Xamarin.Android-Private')), ne(variables['Build.Reason'], 'PullRequest')) }}:
5656
- name: MicroBuildSignType
5757
value: Real

src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ Per usare un percorso JDK personalizzato per una compilazione della riga di coma
997997
{0} - User supplied Maven repository type</comment>
998998
</data>
999999
<data name="XA1037" xml:space="preserve">
1000-
<value>The '{0}' MSBuild property is deprecated and will be removed in .NET {1}. See https://aka.ms/net-android-deprecations for more details.</value>
1000+
<value>La proprietà MSBuild '{0}' è deprecata e verrà rimossa in .NET {1}. Per altri dettagli, vedi https://aka.ms/net-android-deprecations.</value>
10011001
<comment>The following are literal names and should not be translated: MSBuild, .NET.
10021002
{0} - The deprecated MSBuild property name
10031003
{1} - The numeric version of .NET</comment>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
<PropertyGroup>
44
<ProjectGuid>{2DD1EE75-6D8D-4653-A800-0A24367F7F38}</ProjectGuid>
55
<LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
6-
<TargetFramework>netstandard2.0</TargetFramework>
6+
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>..\..\..\..\product.snk</AssemblyOriginatorKeyFile>
99
<NoWarn>$(NoWarn);CA1305</NoWarn>
10+
<_IncludeMicrosoftBuildPackage>true</_IncludeMicrosoftBuildPackage>
1011
</PropertyGroup>
1112
<Import Project="..\..\..\..\Configuration.props" />
1213
<Import Project="..\..\..\..\external\xamarin-android-tools\src\Microsoft.Android.Build.BaseTasks\MSBuildReferences.projitems" />

0 commit comments

Comments
 (0)