Skip to content

Commit a30edf7

Browse files
authored
Merge pull request #1088 from dotnet/dev/moljac/mu-20250205-fix-xamarin.legacy.sdk
Manual Updates 20250205 SDK type fixes for missed projects
2 parents ab6d2d5 + 9486ada commit a30edf7

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Xamarin.Legacy.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
44
<AssemblyName>Xamarin.AndroidX.AppCompat.Resources</AssemblyName>
@@ -42,11 +42,6 @@
4242
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
4343
</PropertyGroup>
4444

45-
<PropertyGroup>
46-
<AndroidClassParser>class-parse</AndroidClassParser>
47-
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
48-
</PropertyGroup>
49-
5045
<ItemGroup>
5146
<None Include="..\..\..\source\PackageLicense.md" Pack="True" PackagePath="LICENSE.md" />
5247
<None Include="..\..\..\build\icon.png" Pack="True" PackagePath="icon.png" />

source/com.google.android.material/Xamarin.Google.Android.Material.Extensions/Xamarin.Google.Android.Material.Extensions.csproj

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="Xamarin.Legacy.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>MonoAndroid12.0;net6.0-android31.0</TargetFrameworks>
3+
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
44
<IsBindingProject>true</IsBindingProject>
55
<AssemblyName>Xamarin.Google.Android.Material.Extensions</AssemblyName>
66
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -38,13 +38,6 @@
3838
<!-- Include symbol files (*.pdb) in the built .nupkg -->
3939
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
4040
</PropertyGroup>
41-
42-
<PropertyGroup>
43-
<AndroidClassParser>class-parse</AndroidClassParser>
44-
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
45-
<AndroidFragmentType>AndroidX.Fragment.App.Fragment</AndroidFragmentType>
46-
</PropertyGroup>
47-
4841

4942
<ItemGroup>
5043
<None Include="..\..\source\PackageLicense.md" Pack="True" PackagePath="LICENSE.md" />
@@ -80,14 +73,5 @@
8073
<!-- For those artifacts with lib/ folder -->
8174
<InputJar Condition="Exists('..\..\..\externals\com.xamarin.google.android.material.extensions\extensions-aar\libs\')" Include="..\..\..\externals\com.xamarin.google.android.material.extensions\extensions-aar\libs\*.jar" />
8275
</ItemGroup>
83-
84-
<ItemGroup>
85-
</ItemGroup>
86-
87-
88-
<ItemGroup>
89-
<!-- PackageReference -->
90-
</ItemGroup>
91-
9276

9377
</Project>

0 commit comments

Comments
 (0)