Skip to content

Commit

Permalink
[Directory.Build.props] Add $(_DefaultTargetFrameworks). (#764)
Browse files Browse the repository at this point in the history
Context: xamarin/AndroidX#712

Although we don't currently build and ship GPS for `net7.0` or `net8.0`, it is a good test exercise to run `generator` against GPS  to ensure we aren't creating any regressions in `generator`.

To do this, we currently have to change the `TargetFrameworks` in many places.

Instead, let's put the default `TargetFrameworks` to build in `Directory.Build.props`, so it only has to be changed in one place.
  • Loading branch information
jpobst authored May 5, 2023
1 parent d5818c3 commit 6e2374a
Show file tree
Hide file tree
Showing 34 changed files with 67 additions and 61 deletions.
16 changes: 16 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
<RepositoryUrl>https://github.com/xamarin/GooglePlayServicesComponents.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>

<!-- Default TFM's we build for -->
<_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android</_DefaultTargetFrameworks>

<!-- Opt out of C#8 features to maintain compatibility with legacy -->
<AndroidBoundInterfacesContainConstants>false</AndroidBoundInterfacesContainConstants>
<AndroidBoundInterfacesContainTypes>false</AndroidBoundInterfacesContainTypes>
Expand All @@ -17,4 +20,17 @@
<!-- Mark .NET6+ packages as supporting trimming -->
<IsTrimmable>true</IsTrimmable>
</PropertyGroup>

<!-- Folders that various files get placed into -->
<ItemGroup>
<_TargetFrameworkNugetBuildFolders Include="build\monoandroid12.0" />
<_TargetFrameworkNugetBuildFolders Include="build\net6.0-android31.0" />
<_TargetFrameworkNugetBuildFolders Include="buildTransitive\monoandroid12.0" />
<_TargetFrameworkNugetBuildFolders Include="buildTransitive\net6.0-android31.0" />
</ItemGroup>

<ItemGroup>
<_TargetFrameworkNugetAarFolders Include="aar\monoandroid12.0" />
<_TargetFrameworkNugetAarFolders Include="aar\net6.0-android31.0" />
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions samples/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<Project>

<!-- Default TFM's we build for -->
<PropertyGroup>
<_DefaultDotNetSampleTargetFrameworks>net6.0-android</_DefaultDotNetSampleTargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-android</TargetFrameworks>
<TargetFrameworks>$(_DefaultDotNetSampleTargetFrameworks)</TargetFrameworks>

<!-- Some packages specify a minimum of 28 (eg: Xamarin.AndroidX.HeifWriter) -->
<!--
Expand Down
2 changes: 1 addition & 1 deletion samples/dotnet/BuildAllFbDotNet/BuildAllFbDotNet.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-android</TargetFramework>
<TargetFramework>$(_DefaultDotNetSampleTargetFrameworks)</TargetFramework>

<!-- Some packages specify a minimum of 29 (eg: StreamProtect) -->
<SupportedOSPlatformVersion>29</SupportedOSPlatformVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/dotnet/BuildAllGpsDotNet/BuildAllGpsDotNet.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-android</TargetFramework>
<TargetFramework>$(_DefaultDotNetSampleTargetFrameworks)</TargetFramework>

<!-- Some packages specify a minimum of 29 (eg: StreamProtect) -->
<SupportedOSPlatformVersion>29</SupportedOSPlatformVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-android</TargetFramework>
<TargetFramework>$(_DefaultDotNetSampleTargetFrameworks)</TargetFramework>

<!-- Some packages specify a minimum of 29 (eg: StreamProtect) -->
<SupportedOSPlatformVersion>29</SupportedOSPlatformVersion>
Expand Down
14 changes: 7 additions & 7 deletions samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-android</TargetFrameworks>
<TargetFrameworks>$(_DefaultDotNetSampleTargetFrameworks)</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>BuildAllMauiApp</RootNamespace>
<UseMaui>true</UseMaui>
Expand Down Expand Up @@ -46,23 +46,23 @@
</ItemGroup>

<Import
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
Project="..\..\..\output\Directory.GPS.packages.props"
/>
<Import
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
Project="..\..\..\output\Directory.FB.packages.props"
/>
<Import
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
Project="..\..\..\output\Directory.MLKit.packages.props"
/>
<Import
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
Project="..\..\..\output\Directory.GP.packages.props"
/>
<Import
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
Project="..\..\..\output\Directory.Diverse.packages.props"
/>

Expand All @@ -79,7 +79,7 @@
[./samples/dotnet/BuildAllMauiApp.sln]
-->
<ItemGroup
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
>
<PackageReference Include="Xamarin.AndroidX.Security.SecurityCrypto" Version="[1.1.0-alpha03]" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-android31</TargetFramework>
<TargetFramework>$(_DefaultDotNetSampleTargetFrameworks)</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions samples/dotnet/Directory.Packages.GPS-FB-MLKit.props
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project >
<Import
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
Project="..\..\output\Directory.GPS.packages.props"
/>
<Import
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
Project="..\..\output\Directory.FB.packages.props"
/>
<Import
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
Project="..\..\output\Directory.MLKit.packages.props"
/>
<Import
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
Project="..\..\output\Directory.GP.packages.props"
/>
<Import
Condition="$(TargetFramework.StartsWith('net6.0-android')) == true"
Condition="$(TargetFramework.StartsWith('$(_DefaultDotNetSampleTargetFrameworks)')) == true"
Project="..\..\output\Directory.Diverse.packages.props"
/>
</Project>
16 changes: 4 additions & 12 deletions source/GooglePlayServicesProject.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@

@{
var targetFrameworkMoniker = "MonoAndroid12.0";
var dotnetFrameworkMoniker = "net6.0-android31.0";
}

<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>@(targetFrameworkMoniker);@(dotnetFrameworkMoniker)</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
@if (!string.IsNullOrEmpty(Model.AssemblyName)) {
<AssemblyName>@(Model.AssemblyName)</AssemblyName>
Expand Down Expand Up @@ -167,19 +166,13 @@
</ItemGroup>

<ItemGroup>
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\@(targetFrameworkMoniker)" />
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="build\@(dotnetFrameworkMoniker)" />
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="buildTransitive\@(targetFrameworkMoniker)" />
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="buildTransitive\@(dotnetFrameworkMoniker)" />
<None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="@@(_TargetFrameworkNugetBuildFolders)" />
</ItemGroup>

@if (@Model.NuGetPackageId == "Xamarin.GooglePlayServices.Basement")
{
<ItemGroup>
<None Include="..\..\source\com.google.android.gms\play-services-basement\buildtasks\bin\$(Configuration)\Xamarin.GooglePlayServices.Tasks.dll" Pack="True" PackagePath="build\@(targetFrameworkMoniker)" />
<None Include="..\..\source\com.google.android.gms\play-services-basement\buildtasks\bin\$(Configuration)\Xamarin.GooglePlayServices.Tasks.dll" Pack="True" PackagePath="build\@(dotnetFrameworkMoniker)" />
<None Include="..\..\source\com.google.android.gms\play-services-basement\buildtasks\bin\$(Configuration)\Xamarin.GooglePlayServices.Tasks.dll" Pack="True" PackagePath="buildTransitive\@(targetFrameworkMoniker)" />
<None Include="..\..\source\com.google.android.gms\play-services-basement\buildtasks\bin\$(Configuration)\Xamarin.GooglePlayServices.Tasks.dll" Pack="True" PackagePath="buildTransitive\@(dotnetFrameworkMoniker)" />
<None Include="..\..\source\com.google.android.gms\play-services-basement\buildtasks\bin\$(Configuration)\Xamarin.GooglePlayServices.Tasks.dll" Pack="True" PackagePath="@@(_TargetFrameworkNugetBuildFolders)" />
</ItemGroup>
}

Expand Down Expand Up @@ -217,8 +210,7 @@
<ItemGroup>
@foreach (var art in @Model.MavenArtifacts) {
if (1==2 && art.MavenArtifactPackaging == "aar") {
<None Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\@(targetFrameworkMoniker)" />
<None Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\@(dotnetFrameworkMoniker)" />
<None Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" Pack="True" PackagePath="@@(_TargetFrameworkNugetAarFolders)" />
}
}
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion templates/annotations/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/chromium-cronet/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/codehaus-mojo/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/dagger/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/datatransport/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/errorprone/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/findbugs/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/flatbuffers/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31.0</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
11 changes: 2 additions & 9 deletions templates/glide/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down Expand Up @@ -71,13 +71,6 @@
<Compile Include="..\..\source\@(Model.MavenArtifacts[0].MavenGroupId)\@(Model.MavenArtifacts[0].MavenArtifactId)\Additions\*.cs" Link="Additions\%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<GlideBuildFolders Include="build\monoandroid12.0" />
<GlideBuildFolders Include="build\net6.0-android31.0" />
<GlideBuildFolders Include="buildTransitive\monoandroid12.0" />
<GlideBuildFolders Include="buildTransitive\net6.0-android31.0" />
</ItemGroup>

<ItemGroup>
@foreach (var art in @Model.MavenArtifacts)
{
Expand All @@ -99,7 +92,7 @@
default:
break;
}
<None Include="..\..\source\@(Model.MavenArtifacts[0].MavenGroupId)\@(Model.MavenArtifacts[0].MavenArtifactId)\$(PackageId).targets" Pack="True" PackagePath="@@(GlideBuildFolders)" />
<None Include="..\..\source\@(Model.MavenArtifacts[0].MavenGroupId)\@(Model.MavenArtifacts[0].MavenArtifactId)\$(PackageId).targets" Pack="True" PackagePath="@@(_TargetFrameworkNugetBuildFolders)" />
<JavaSourcesJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar" Link="Jars\%(Filename)%(Extension)" />
}
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion templates/grpc/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/javax-inject/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/opencensus/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/perfmark/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/protobuf-lite/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/squareup-javapoet/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31.0</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/squareup-okhttp/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/squareup-okhttp3/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/squareup-okio/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/squareup-picasso/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/squareup-retrofit/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<!--
No warnings for:
Expand Down
2 changes: 1 addition & 1 deletion templates/squareup-retrofit2/Project.cshtml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android31</TargetFrameworks>
<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
<RootNamespace>@Model.NuGetPackageId</RootNamespace>
<AssemblyName>@Model.NuGetPackageId</AssemblyName>
<IsBindingProject>true</IsBindingProject>
Expand Down
Loading

0 comments on commit 6e2374a

Please sign in to comment.