Skip to content

Commit fcdf728

Browse files
pjcollinspjcollins
authored
[.NET 5] Rename new SDK, Ref, and Runtime packs (#4595)
Rename and reorganize the sources and projects used to create our .NET 5 SDK, Targeting, and Runtime packs. The `src/Xamarin.Android.Sdk/` directory has been mostly moved to `src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/`, as it contains our .NET 5 `.props` and `.targets` files and logic that is very closely tied to `Xamarin.Android.Build.Tasks` content. All `.proj` files which were used to create a `nupkg` file have been moved into `build-tools/create-packs/`. Update the FrameworkName from `Xamarin.Android.App` to `Microsoft.Android`, and the framework Name from `Xamarin Android - NET 5.0"` to `.NET 5.0 - Android`. A new MSBuild target has been added to the common `create-packs`' `Directory.Build.targets` file to allow all packs to be created with one simple command: msbuild /t:CreateAllPacks build-tools/create-packs/Microsoft.Android.Sdk.proj Move former contents of `src/Xamarin.Android.Sdk/README.md` into `Documentation/guides/DotNet5.md`.
1 parent 192497b commit fcdf728

25 files changed

+123
-113
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apk-sizes-*.txt
2020
*.rawproto
2121
*.binlog
2222
src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.props
23-
src/Xamarin.Android.Sdk/targets/Xamarin.Android.Sdk.BundledVersions.props
23+
src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BundledVersions.props
2424
*~
2525
external/monodroid/
2626
external/mono/

‎Documentation/guides/DotNet5.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ In .NET 5 the behavior of the following MSBuild tasks will change, but
3535

3636
`$(AndroidUseIntermediateDesignerFile)` will be `True` by default.
3737

38+
## Default file inclusion
39+
40+
Default Android related file globbing behavior is defined in `Microsoft.Android.Sdk.DefaultItems.props`.
41+
3842
## dotnet cli
3943

4044
There are currently two "verbs" we are aiming to get working in
@@ -65,3 +69,43 @@ Almost everything else happens during `donet publish`:
6569
* Compile java code via `javac`
6670
* Convert java code to `.dex` via d8/r8
6771
* Create an `.apk` or `.aab` and sign it
72+
73+
74+
### Preview testing
75+
76+
The following instructions can be used for early preview testing.
77+
78+
1) Install the [latest .NET 5 preview][0]. Preview 4 or later is required.
79+
80+
2) Create a `nuget.config` file that has a package source pointing to
81+
local packages or `xamarin-impl` feed, as well as the .NET 5 feed:
82+
83+
```xml
84+
<configuration>
85+
<packageSources>
86+
<add key="xamarin-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
87+
<add key="dotnet5" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5/nuget/v3/index.json" />
88+
</packageSources>
89+
</configuration>
90+
```
91+
92+
3) Open an existing Android project (ideally something minimal) and
93+
tweak it as shown below. The version should match the version of the
94+
packages you want to use:
95+
96+
```xml
97+
<Project Sdk="Microsoft.Android.Sdk/10.4.99.24">
98+
<PropertyGroup>
99+
<TargetFramework>netcoreapp5.0</TargetFramework>
100+
<RuntimeIdentifier>android.21-arm64</RuntimeIdentifier>
101+
</PropertyGroup>
102+
</Project>
103+
```
104+
105+
4) Publish (and optionally install) the project:
106+
107+
```
108+
dotnet publish -t:Install *.csproj
109+
```
110+
111+
[0]: https://github.com/dotnet/installer#installers-and-binaries

‎build-tools/automation/azure-pipelines.yaml‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -186,22 +186,11 @@ stages:
186186
targetPath: xamarin-android/bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName)
187187

188188
- task: MSBuild@1
189-
displayName: pack runtime nupkgs
189+
displayName: pack all nupkgs
190190
inputs:
191-
solution: $(System.DefaultWorkingDirectory)/xamarin-android/build-tools/Xamarin.Android.App/Xamarin.Android.App.Runtime.proj
191+
solution: $(System.DefaultWorkingDirectory)/xamarin-android/build-tools/create-packs/Microsoft.Android.Sdk.proj
192192
configuration: $(XA.Build.Configuration)
193-
msbuildArguments: /t:_PackAllRuntimePacks /restore /bl:$(System.DefaultWorkingDirectory)/bin/Build$(XA.Build.Configuration)/create-runtime-packs.binlog
194-
195-
- task: DotNetCoreCLI@2
196-
displayName: pack sdk and ref nupkgs
197-
inputs:
198-
command: pack
199-
packagesToPack: "\
200-
$(System.DefaultWorkingDirectory)/xamarin-android/build-tools/Xamarin.Android.App/Xamarin.Android.App.Ref.proj;
201-
$(System.DefaultWorkingDirectory)/xamarin-android/src/Xamarin.Android.Sdk/Xamarin.Android.Sdk.proj;
202-
$(System.DefaultWorkingDirectory)/xamarin-android/src/Xamarin.Android.Sdk/Xamarin.Android.Sdk.Lite.proj"
203-
configuration: $(XA.Build.Configuration)
204-
packDirectory: $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/$(NuGetArtifactName)
193+
msbuildArguments: /t:CreateAllPacks /restore /bl:$(System.DefaultWorkingDirectory)/bin/Build$(XA.Build.Configuration)/create-all-packs.binlog
205194

206195
- task: NuGetCommand@2
207196
displayName: push nupkgs
@@ -302,22 +291,11 @@ stages:
302291
msbuildArguments: /p:CreateVsixContainer=True /p:ZipPackageCompressionLevel=Normal /bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\msbuild-create-vsix.binlog
303292

304293
- task: MSBuild@1
305-
displayName: pack runtime nupkgs
306-
inputs:
307-
solution: $(System.DefaultWorkingDirectory)\build-tools\Xamarin.Android.App\Xamarin.Android.App.Runtime.proj
308-
configuration: $(XA.Build.Configuration)
309-
msbuildArguments: /t:_PackAllRuntimePacks /restore /bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\create-runtime-packs.binlog
310-
311-
- task: DotNetCoreCLI@2
312-
displayName: pack sdk and ref nupkgs
294+
displayName: pack all nupkgs
313295
inputs:
314-
command: pack
315-
packagesToPack: "\
316-
$(System.DefaultWorkingDirectory)\\build-tools\\Xamarin.Android.App\\Xamarin.Android.App.Ref.proj;
317-
$(System.DefaultWorkingDirectory)\\src\\Xamarin.Android.Sdk\\Xamarin.Android.Sdk.proj;
318-
$(System.DefaultWorkingDirectory)\\src\\Xamarin.Android.Sdk\\Xamarin.Android.Sdk.Lite.proj"
296+
solution: $(System.DefaultWorkingDirectory)\build-tools\create-packs\Microsoft.Android.Sdk.proj
319297
configuration: $(XA.Build.Configuration)
320-
packDirectory: $(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\$(NuGetArtifactName)
298+
msbuildArguments: /t:CreateAllPacks /restore /bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\create-all-packs.binlog
321299

322300
- task: CmdLine@1
323301
displayName: xabuild Xamarin.Android-Tests

‎build-tools/Xamarin.Android.App/Directory.Build.targets‎ renamed to ‎build-tools/create-packs/Directory.Build.targets‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212

1313
<!-- Include initial pack content in ref and runtime. We aren't yet generating separate reference and runtime assemblies. -->
1414
<ItemGroup>
15-
<_AndroidAppPackAssemblies Include="$(XamarinAndroidSourcePath)bin\$(Configuration)\lib\xamarin.android\xbuild-frameworks\Xamarin.Android.App\netcoreapp3.1\Java.Interop.dll" />
16-
<_AndroidAppPackAssemblies Include="$(XamarinAndroidSourcePath)bin\$(Configuration)\lib\xamarin.android\xbuild-frameworks\Xamarin.Android.App\netcoreapp3.1\Mono.Android.dll" />
17-
<_AndroidAppPackAssemblies Include="$(XamarinAndroidSourcePath)bin\$(Configuration)\lib\xamarin.android\xbuild-frameworks\Xamarin.Android.App\netcoreapp3.1\Mono.Android.Export.dll" />
15+
<_AndroidAppPackAssemblies Include="$(XamarinAndroidSourcePath)bin\$(Configuration)\lib\xamarin.android\xbuild-frameworks\Microsoft.Android\netcoreapp3.1\Java.Interop.dll" />
16+
<_AndroidAppPackAssemblies Include="$(XamarinAndroidSourcePath)bin\$(Configuration)\lib\xamarin.android\xbuild-frameworks\Microsoft.Android\netcoreapp3.1\Mono.Android.dll" />
17+
<_AndroidAppPackAssemblies Include="$(XamarinAndroidSourcePath)bin\$(Configuration)\lib\xamarin.android\xbuild-frameworks\Microsoft.Android\netcoreapp3.1\Mono.Android.Export.dll" />
1818
<FrameworkListFileClass Include="@(_AndroidAppPackAssemblies->'%(Filename)%(Extension)')" Profile="Android" />
1919
</ItemGroup>
2020

2121
<!-- https://github.com/dotnet/runtime/blob/0647ec314948904319da5eb15e9931f7c85ed1e2/src/installer/pkg/projects/Directory.Build.targets#L281 -->
2222
<Target Name="_GenerateFrameworkListFile" >
2323
<!-- Hardcode framework attributes -->
2424
<ItemGroup>
25-
<FrameworkListRootAttributes Include="Name" Value="Xamarin Android - NET 5.0" />
25+
<FrameworkListRootAttributes Include="Name" Value=".NET 5.0 - Android" />
2626
<FrameworkListRootAttributes Include="TargetFrameworkIdentifier" Value=".NETCoreApp" />
2727
<FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="5.0" />
28-
<FrameworkListRootAttributes Include="FrameworkName" Value="Xamarin.Android.App" />
28+
<FrameworkListRootAttributes Include="FrameworkName" Value="Microsoft.Android" />
2929
</ItemGroup>
3030

3131
<!-- https://github.com/dotnet/arcade/blob/1924d7ea148c9f26ca3d82b60f0a775a5389ed22/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/src/CreateFrameworkListFile.cs -->
@@ -48,11 +48,18 @@
4848
</PropertyGroup>
4949
</Target>
5050

51-
<Target Name="_PackAllRuntimePacks" >
52-
<Exec Command="dotnet pack -p:Configuration=$(Configuration) -p:AndroidRID=android.21-arm -p:AndroidABI=armeabi-v7a &quot;$(MSBuildThisFileDirectory)Xamarin.Android.App.Runtime.proj&quot;" />
53-
<Exec Command="dotnet pack -p:Configuration=$(Configuration) -p:AndroidRID=android.21-arm64 -p:AndroidABI=arm64-v8a &quot;$(MSBuildThisFileDirectory)Xamarin.Android.App.Runtime.proj&quot;" />
54-
<Exec Command="dotnet pack -p:Configuration=$(Configuration) -p:AndroidRID=android.21-x86 -p:AndroidABI=x86 &quot;$(MSBuildThisFileDirectory)Xamarin.Android.App.Runtime.proj&quot;" />
55-
<Exec Command="dotnet pack -p:Configuration=$(Configuration) -p:AndroidRID=android.21-x64 -p:AndroidABI=x86_64 &quot;$(MSBuildThisFileDirectory)Xamarin.Android.App.Runtime.proj&quot;" />
51+
<Target Name="CreateAllRuntimePacks" >
52+
<Exec Command="dotnet pack -p:Configuration=$(Configuration) -p:AndroidRID=android.21-arm -p:AndroidABI=armeabi-v7a &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
53+
<Exec Command="dotnet pack -p:Configuration=$(Configuration) -p:AndroidRID=android.21-arm64 -p:AndroidABI=arm64-v8a &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
54+
<Exec Command="dotnet pack -p:Configuration=$(Configuration) -p:AndroidRID=android.21-x86 -p:AndroidABI=x86 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
55+
<Exec Command="dotnet pack -p:Configuration=$(Configuration) -p:AndroidRID=android.21-x64 -p:AndroidABI=x86_64 &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Runtime.proj&quot;" />
56+
</Target>
57+
58+
<Target Name="CreateAllPacks"
59+
DependsOnTargets="CreateAllRuntimePacks" >
60+
<Exec Command="dotnet pack -p:Configuration=$(Configuration) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Ref.proj&quot;" />
61+
<Exec Command="dotnet pack -p:Configuration=$(Configuration) &quot;$(MSBuildThisFileDirectory)Microsoft.Android.Sdk.proj&quot;" />
62+
<Exec Command="dotnet pack -p:Configuration=$(Configuration) &quot;$(MSBuildThisFileDirectory)Xamarin.Android.Sdk.Lite.proj&quot;" />
5663
</Target>
5764

5865
</Project>

‎build-tools/Xamarin.Android.App/Xamarin.Android.App.Ref.proj‎ renamed to ‎build-tools/create-packs/Microsoft.Android.Ref.proj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<!--
22
***********************************************************************************************
3-
Xamarin.Android.App.Ref.proj
3+
Microsoft.Android.Ref.proj
44
5-
This project file is used to create the Xamarin.Android.App.Ref NuGet, which is the
5+
This project file is used to create the Microsoft.Android.Ref NuGet, which is the
66
targeting pack containing reference assemblies and other compile time assets required
7-
by projects that use the Xamarin.Android.App framework in .NET 5.
7+
by projects that use the Microsoft.Android framework in .NET 5.
88
***********************************************************************************************
99
-->
1010
<Project Sdk="Microsoft.Build.NoTargets/1.0.88">
1111

1212
<PropertyGroup>
1313
<TargetFramework>netcoreapp3.1</TargetFramework>
14-
<PackageId>Xamarin.Android.App.Ref</PackageId>
14+
<PackageId>Microsoft.Android.Ref</PackageId>
1515
<Authors>Microsoft</Authors>
16-
<Description>Xamarin.Android reference assemblies. Please do not reference directly.</Description>
16+
<Description>Microsoft.Android reference assemblies. Please do not reference directly.</Description>
1717
<OutputPath>..\..\bin\Build$(Configuration)\nupkgs\</OutputPath>
1818
<_AndroidRefPackAssemblyPath>ref\netcoreapp5.0</_AndroidRefPackAssemblyPath>
1919
</PropertyGroup>
@@ -34,9 +34,9 @@ by projects that use the Xamarin.Android.App framework in .NET 5.
3434

3535
<ItemGroup>
3636
<_PackageFiles Include="@(_AndroidAppPackAssemblies)" PackagePath="$(_AndroidRefPackAssemblyPath)" TargetPath="$(_AndroidRefPackAssemblyPath)" />
37-
<_PackageFiles Include="$(XAInstallPrefix)xbuild-frameworks\Xamarin.Android.App\netcoreapp3.1\mono.android.jar" PackagePath="$(_AndroidRefPackAssemblyPath)" />
38-
<_PackageFiles Include="$(XAInstallPrefix)xbuild-frameworks\Xamarin.Android.App\netcoreapp3.1\mono.android.dex" PackagePath="$(_AndroidRefPackAssemblyPath)" />
39-
<_PackageFiles Include="$(XAInstallPrefix)xbuild-frameworks\Xamarin.Android.App\netcoreapp3.1\AndroidApiInfo.xml" PackagePath="$(_AndroidRefPackAssemblyPath)" />
37+
<_PackageFiles Include="$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\netcoreapp3.1\mono.android.jar" PackagePath="$(_AndroidRefPackAssemblyPath)" />
38+
<_PackageFiles Include="$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\netcoreapp3.1\mono.android.dex" PackagePath="$(_AndroidRefPackAssemblyPath)" />
39+
<_PackageFiles Include="$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\netcoreapp3.1\AndroidApiInfo.xml" PackagePath="$(_AndroidRefPackAssemblyPath)" />
4040
</ItemGroup>
4141
</Target>
4242

‎build-tools/Xamarin.Android.App/Xamarin.Android.App.Runtime.proj‎ renamed to ‎build-tools/create-packs/Microsoft.Android.Runtime.proj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!--
22
***********************************************************************************************
3-
Xamarin.Android.App.Runtime.proj
3+
Microsoft.Android.Runtime.proj
44
5-
This project file is used to create Xamarin.Android.App.Runtime NuGets, which are
5+
This project file is used to create Microsoft.Android.Runtime NuGets, which are
66
runtime packs that contain the assets required for a self-contained publish of
7-
projects that use the Xamarin.Android.App framework in .NET 5.
7+
projects that use the Microsoft.Android framework in .NET 5.
88
***********************************************************************************************
99
-->
1010
<Project Sdk="Microsoft.Build.NoTargets/1.0.88">
@@ -13,9 +13,9 @@ projects that use the Xamarin.Android.App framework in .NET 5.
1313
<TargetFramework>netcoreapp3.1</TargetFramework>
1414
<AndroidRID Condition=" '$(AndroidRID)' == '' ">android.21-arm64</AndroidRID>
1515
<AndroidABI Condition=" '$(AndroidABI)' == '' ">arm64-v8a</AndroidABI>
16-
<PackageId>Xamarin.Android.App.Runtime.$(AndroidRID)</PackageId>
16+
<PackageId>Microsoft.Android.Runtime.$(AndroidRID)</PackageId>
1717
<Authors>Microsoft</Authors>
18-
<Description>Xamarin.Android runtime components. Please do not reference directly.</Description>
18+
<Description>Microsoft.Android runtime components. Please do not reference directly.</Description>
1919
<OutputPath>..\..\bin\Build$(Configuration)\nupkgs\</OutputPath>
2020
<_AndroidRuntimePackAssemblyPath>runtimes\$(AndroidRID)\lib\netcoreapp5.0</_AndroidRuntimePackAssemblyPath>
2121
<_AndroidRuntimePackNativePath>runtimes\$(AndroidRID)\native</_AndroidRuntimePackNativePath>

‎src/Xamarin.Android.Sdk/Xamarin.Android.Sdk.proj‎ renamed to ‎build-tools/create-packs/Microsoft.Android.Sdk.proj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<!--
22
***********************************************************************************************
3-
Xamarin.Android.Sdk.proj
3+
Microsoft.Android.Sdk.proj
44
5-
This project file is used to create the Xamarin.Android.Sdk NuGet, which will serve as
5+
This project file is used to create the Microsoft.Android.Sdk NuGet, which will serve as
66
the new entry point for short-form style Android projets in .NET 5.
77
***********************************************************************************************
88
-->
99
<Project Sdk="Microsoft.Build.NoTargets/1.0.88">
1010

1111
<PropertyGroup>
1212
<TargetFramework>netstandard2.0</TargetFramework>
13-
<PackageId>Xamarin.Android.Sdk</PackageId>
13+
<PackageId>Microsoft.Android.Sdk</PackageId>
1414
<Authors>Microsoft</Authors>
1515
<Description>C# Tools and Bindings for the Android SDK</Description>
1616
<OutputPath>..\..\bin\Build$(Configuration)\nupkgs\</OutputPath>
@@ -72,9 +72,9 @@ the new entry point for short-form style Android projets in .NET 5.
7272
/>
7373
<ItemGroup>
7474
<_PackageFiles Include="$(ToolsSourceDir)**" PackagePath="tools" />
75-
<_PackageFiles Include="$(XamarinAndroidSourcePath)\src\Xamarin.Android.Sdk\Sdk\**" PackagePath="Sdk" />
76-
<_PackageFiles Include="$(XamarinAndroidSourcePath)\src\Xamarin.Android.Sdk\targets\**"
77-
Exclude="$(XamarinAndroidSourcePath)\src\Xamarin.Android.Sdk\**\*.Lite.*"
75+
<_PackageFiles Include="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.Android.Sdk\Sdk\**" PackagePath="Sdk" />
76+
<_PackageFiles Include="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.Android.Sdk\targets\**"
77+
Exclude="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.Android.Sdk\**\*.Lite.*"
7878
PackagePath="targets" />
7979
</ItemGroup>
8080
</Target>
@@ -88,7 +88,7 @@ the new entry point for short-form style Android projets in .NET 5.
8888
<_AndroidNETSdkVersion>$(ProductVersion).$(XAVersionCommitCount)</_AndroidNETSdkVersion>
8989
<_AndroidNETAppPackageVersion>$(ProductVersion).$(XAVersionCommitCount)</_AndroidNETAppPackageVersion>
9090
<_AndroidNETAppTargetFramework>netcoreapp5.0</_AndroidNETAppTargetFramework>
91-
<BundledVersionsPropsFileName>Xamarin.Android.Sdk.BundledVersions.props</BundledVersionsPropsFileName>
91+
<BundledVersionsPropsFileName>Microsoft.Android.Sdk.BundledVersions.props</BundledVersionsPropsFileName>
9292
</PropertyGroup>
9393

9494
<ItemGroup>
@@ -111,14 +111,14 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
111111
<AndroidNETSdkVersion>$(_AndroidNETSdkVersion)</AndroidNETSdkVersion>
112112
</PropertyGroup>
113113
<ItemGroup>
114-
<KnownFrameworkReference Include="Xamarin.Android.App"
114+
<KnownFrameworkReference Include="Microsoft.Android"
115115
TargetFramework="$(_AndroidNETAppTargetFramework)"
116-
RuntimeFrameworkName="Xamarin.Android.App"
116+
RuntimeFrameworkName="Microsoft.Android"
117117
DefaultRuntimeFrameworkVersion="$(_AndroidNETAppPackageVersion)"
118118
LatestRuntimeFrameworkVersion="$(_AndroidNETAppPackageVersion)"
119-
TargetingPackName="Xamarin.Android.App.Ref"
119+
TargetingPackName="Microsoft.Android.Ref"
120120
TargetingPackVersion="$(_AndroidNETAppPackageVersion)"
121-
RuntimePackNamePatterns="Xamarin.Android.App.Runtime.**RID**"
121+
RuntimePackNamePatterns="Microsoft.Android.Runtime.**RID**"
122122
RuntimePackRuntimeIdentifiers="@(_AndroidNETAppRuntimePackRids, '%3B')"
123123
Profile="Android"
124124
/>
@@ -128,7 +128,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
128128
</BundledVersionsPropsContent>
129129
</PropertyGroup>
130130

131-
<WriteLinesToFile File="$(MSBuildThisFileDirectory)targets\$(BundledVersionsPropsFileName)"
131+
<WriteLinesToFile File="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.Android.Sdk\targets\$(BundledVersionsPropsFileName)"
132132
Lines="$(BundledVersionsPropsContent)"
133133
Overwrite="true" />
134134
</Target>

0 commit comments

Comments
 (0)