Skip to content

Commit b8cf02a

Browse files
committed
fix: Remove deprecated GenerateBuild for VS2022 compatibility
1 parent d813951 commit b8cf02a

File tree

5 files changed

+2
-10
lines changed

5 files changed

+2
-10
lines changed

build/ci/.azure-devops-android-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
msbuildLocationMethod: version
8080
msbuildVersion: latest
8181
msbuildArchitecture: x86
82-
msbuildArguments: /m /r /p:Configuration=Release /p:IsUiAutomationMappingEnabled=true
82+
msbuildArguments: /m /r /p:Configuration=Release /p:IsUiAutomationMappingEnabled=true /p:AndroidBuildApplicationPackage=True
8383
clean: false
8484
maximumCpuCount: true
8585
restoreNugetPackages: false

doc/articles/get-started-rider.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ You should now have a folder structure that looks like this:
5656
![rider-folder-structure](Assets/quick-start/rider-folder-structure.JPG)
5757

5858
### Android
59-
1. Remove the following line from the `YourProject.Droid.csproj` file:
60-
`<Target Name="GenerateBuild" DependsOnTargets="SignAndroidPackage" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''" />`
61-
2. Set Android as your startup project. Run.
59+
1. Set Android as your startup project. Run.
6260
![run-android-rider](Assets/quick-start/run-android-rider.JPG)
6361

6462
Note: Whether you're using a physical device or the emulator, the app will install but will not automatically open.

src/SamplesApp/SamplesApp.Droid/SamplesApp.Droid.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@
207207
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
208208
<Import Project="..\Benchmarks.Shared\Benchmarks.Shared.projitems" Label="Shared" />
209209
<Import Project="..\SamplesApp.UnitTests.Shared\SamplesApp.UnitTests.targets" />
210-
<Target Name="GenerateBuild" DependsOnTargets="SignAndroidPackage" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'=='' and '$(UnoSampleAppDisableAPKGeneration)'==''" />
211210
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
212211
Other similar extension points exist, see Microsoft.Common.targets.
213212
<Target Name="BeforeBuild">

src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-prism/BlankApp.Droid/BlankApp.Droid.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,4 @@
9797
</ItemGroup>
9898
<Import Project="..\BlankApp.Shared\BlankApp.Shared.projitems" Label="Shared" Condition="Exists('..\BlankApp.Shared\BlankApp.Shared.projitems')" />
9999
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
100-
<!-- This will force the generation of the APK when not building inside visual studio -->
101-
<Target Name="GenerateBuild" DependsOnTargets="SignAndroidPackage" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''" />
102100
</Project>

src/SolutionTemplate/UnoSolutionTemplate/Droid/UnoQuickStart.Droid.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@
9797
<Import Project="..\$ext_safeprojectname$.Shared\$ext_safeprojectname$.Shared.projitems" Label="Shared" />
9898
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
9999

100-
<!-- This will force the generation of the APK when not building inside visual studio -->
101-
<Target Name="GenerateBuild" DependsOnTargets="SignAndroidPackage" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''" />
102-
103100
<Target Name="Issue3897Workaround"
104101
Condition=" '$(ManagedDesignTimeBuild)' == 'True' "
105102
AfterTargets="_RemoveLegacyDesigner">

0 commit comments

Comments
 (0)